From 4e0d4f42800be97eac01eafb9647d3168106a4ba Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Wed, 20 Jan 2021 16:12:06 +0100 Subject: [PATCH 1/2] Remove flash message, keep only form errors SCI-5406 --- app/assets/javascripts/projects/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/projects/index.js b/app/assets/javascripts/projects/index.js index 7010c5672..d1c997aa6 100644 --- a/app/assets/javascripts/projects/index.js +++ b/app/assets/javascripts/projects/index.js @@ -356,7 +356,6 @@ HelperModule.flashAlertMsg(data.message, 'success'); refreshCurrentView(); }).on('ajax:error', function(ev, data) { - HelperModule.flashAlertMsg(data.responseJSON.message, 'danger'); if ($(this).hasClass('edit_project')) { $(this).renderFormErrors('project', data.responseJSON.errors); } else { From 95b22a2658e654bb4ff2951a5a3c421b2e9f4d70 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Wed, 20 Jan 2021 16:21:30 +0100 Subject: [PATCH 2/2] Update flash message when 0 projects for export SCI-5351 --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index bd3702fb8..e6b6f7f00 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -461,7 +461,7 @@ en: modal_text_p3_html: "Please note that the number of exports is limited to %{limit} requests per day. After you confirm this export you will have %{num} left." modal_submit: "Export" success_flash: "Export request received. Your export request is being processed." - zero_projects_flash: "You have to select at least one project" + zero_projects_flash: "The folder is empty. No projects can be exported." activity: visibility_hidden: "Project members only" visibility_visible: "All team members"