From ff998a6c984b2a085784348ce0ef9c2b7667fa64 Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Wed, 15 Nov 2017 14:21:04 +0100 Subject: [PATCH 1/3] change text for avatar size on my profile page --- app/assets/javascripts/sitewide/form_validators.js.erb | 2 +- config/locales/en.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/sitewide/form_validators.js.erb b/app/assets/javascripts/sitewide/form_validators.js.erb index aca5ef0f3..42b724412 100644 --- a/app/assets/javascripts/sitewide/form_validators.js.erb +++ b/app/assets/javascripts/sitewide/form_validators.js.erb @@ -163,7 +163,7 @@ function filesSizeValidator(ev, fileInputs, fileTypeEnum) { case FileTypeEnum.FILE: return "<%= I18n.t('general.file.total_size', size: Constants::FILE_MAX_SIZE_MB) %>".strToErrorFormat(); case FileTypeEnum.AVATAR: - return "<%= I18n.t('general.file.total_size', size: Constants::AVATAR_MAX_SIZE_MB) %>".strToErrorFormat(); + return "<%= I18n.t('users.registrations.edit.avatar_total_size', size: Constants::AVATAR_MAX_SIZE_MB) %>".strToErrorFormat(); } } } diff --git a/config/locales/en.yml b/config/locales/en.yml index 01790783f..c450ad240 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1251,6 +1251,7 @@ en: avatar_title: "Change avatar" avatar_edit_label: "Upload new avatar file" avatar_submit: "Upload" + avatar_total_size: "Your avatar file cannot be larger than 0.2 MB. (Please try again with a smaller file.)" name_label: "Full name" name_title: "Change name" initials_label: "Initials" From cd006c2640f47be05931bc9313b692af29c692af Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Wed, 15 Nov 2017 14:32:19 +0100 Subject: [PATCH 2/3] change text for expiry of a link for an exported file --- config/locales/en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 01790783f..d99913650 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1792,8 +1792,8 @@ en: zip_export: modal_label: 'Export repository' notification_title: 'Your package is ready to be exported!' - expired_title: 'The required file was expired!' - expired_description: 'The downloadable file expires in 7 days after its creation.' + expired_title: 'Looks like your link has expired.' + expired_description: 'Please export the data again in order to receive a new link.' modal_label: 'Export request received' modal_html: "

Your export request is being processed.

When completed we will send an email to %{email} inbox with a link to your exported samples. Note that the link will expire in 7 days.

" repository_html: '

You are about to export selected items in repository %{repository}


Repository will be exported in a .csv file format. You will receive email with a link where you can download it.' From f2026872916cf073a09d65ad23f98d1da697e864 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Wed, 15 Nov 2017 16:40:14 +0100 Subject: [PATCH 3/3] Allow import of the sample with missing non mandatory fields [SCI-1819] --- app/models/team.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/team.rb b/app/models/team.rb index 3331ef8c3..62423b35d 100644 --- a/app/models/team.rb +++ b/app/models/team.rb @@ -94,6 +94,7 @@ class Team < ActiveRecord::Base end row.each.with_index do |value, index| + next unless value.present? if index == stype_index stype = SampleType.where(team: self) .where('name ILIKE ?', value.strip)