From f1e04cc6045938f8accf627e755b8e7c15de80c5 Mon Sep 17 00:00:00 2001 From: artoscinote <85488244+artoscinote@users.noreply.github.com> Date: Wed, 2 Feb 2022 10:41:29 +0100 Subject: [PATCH] Fix appearance of members pagination, copy fix [SCI-6265] (#3792) --- app/assets/javascripts/my_modules/repositories.js | 2 +- app/assets/javascripts/reports/reports_datatable.js | 2 +- app/assets/javascripts/repositories/index.js | 2 +- app/assets/javascripts/repositories/repository_datatable.js | 2 +- app/assets/javascripts/sitewide/datatable_helpers.js | 2 +- config/locales/en.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/my_modules/repositories.js b/app/assets/javascripts/my_modules/repositories.js index 46644605c..57e4efeec 100644 --- a/app/assets/javascripts/my_modules/repositories.js +++ b/app/assets/javascripts/my_modules/repositories.js @@ -174,7 +174,7 @@ var MyModuleRepositories = (function() { fnInitComplete: function() { var dataTableWrapper = $(tableContainer).closest('.dataTables_wrapper'); - DataTableHelpers.initLengthApearance(dataTableWrapper); + DataTableHelpers.initLengthAppearance(dataTableWrapper); DataTableHelpers.initSearchField(dataTableWrapper, I18n.t('repositories.show.filter_inventory_items')); $('').appendTo($('.search-container')); dataTableWrapper.find('.main-actions, .pagination-row').removeClass('hidden'); diff --git a/app/assets/javascripts/reports/reports_datatable.js b/app/assets/javascripts/reports/reports_datatable.js index d73903938..3faaa1bb1 100644 --- a/app/assets/javascripts/reports/reports_datatable.js +++ b/app/assets/javascripts/reports/reports_datatable.js @@ -261,7 +261,7 @@ fnDrawCallback: tableDrowCallback, createdRow: addAttributesToRow, fnInitComplete: function() { - DataTableHelpers.initLengthApearance($table.closest('.dataTables_wrapper')); + DataTableHelpers.initLengthAppearance($table.closest('.dataTables_wrapper')); $('.pagination-row').removeClass('hidden'); $('.report-row.processing').each(function() { setTimeout(() => { checkProcessingStatus($(this).data('id')); }, START_POLLING_INTERVAL); diff --git a/app/assets/javascripts/repositories/index.js b/app/assets/javascripts/repositories/index.js index 5d31ec948..ce559e863 100644 --- a/app/assets/javascripts/repositories/index.js +++ b/app/assets/javascripts/repositories/index.js @@ -96,7 +96,7 @@ updateActionButtons(); } }); - DataTableHelpers.initLengthApearance(dataTableWrapper); + DataTableHelpers.initLengthAppearance(dataTableWrapper); DataTableHelpers.initSearchField(dataTableWrapper, I18n.t('repositories.index.filter_inventory')); $('.content-body .toolbar').html($('#repositoriesListButtons').html()); dataTableWrapper.find('.main-actions, .pagination-row').removeClass('hidden'); diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js index 397c06d4c..23a25b0ce 100644 --- a/app/assets/javascripts/repositories/repository_datatable.js +++ b/app/assets/javascripts/repositories/repository_datatable.js @@ -573,7 +573,7 @@ var RepositoryDatatable = (function(global) { initSaveButton(); initCancelButton(); - DataTableHelpers.initLengthApearance($(TABLE_ID).closest('.dataTables_wrapper')); + DataTableHelpers.initLengthAppearance($(TABLE_ID).closest('.dataTables_wrapper')); DataTableHelpers.initSearchField($(TABLE_ID).closest('.dataTables_wrapper'), I18n.t('repositories.show.filter_inventory_items')); $('').appendTo($('.search-container')); diff --git a/app/assets/javascripts/sitewide/datatable_helpers.js b/app/assets/javascripts/sitewide/datatable_helpers.js index 5c4cee6f7..88e433d4c 100644 --- a/app/assets/javascripts/sitewide/datatable_helpers.js +++ b/app/assets/javascripts/sitewide/datatable_helpers.js @@ -2,7 +2,7 @@ var DataTableHelpers = (function() { return { - initLengthApearance: function(dataTableWraper) { + initLengthAppearance: function(dataTableWraper) { var tableLengthSelect = $(dataTableWraper).find('.dataTables_length select'); if (tableLengthSelect.val() == null) { tableLengthSelect.val(10).change(); diff --git a/config/locales/en.yml b/config/locales/en.yml index d73148016..01ab2e093 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2519,7 +2519,7 @@ en: experiment_annotation_message_html: "Project: %{project} | Experiment: %{experiment}" project_comment_annotation_title: "%{user} mentioned you in a comment on project %{project}." project_annotation_message_html: "Project: %{project}" - my_module_description_annotation_title: "%{user} mentioned you in a description on task %{my_module}." + my_module_description_annotation_title: "%{user} mentioned you in notes on task %{my_module}." my_module_description_annotation_message_html: "Project: %{project} | Experiment: %{experiment} | Task: %{my_module}" my_module_comment_annotation_title: "%{user} mentioned you in a comment on task %{my_module}." my_module_comment_annotation_message_html: "Project: %{project} | Experiment: %{experiment} | Task: %{my_module}"