scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-13 08:34:49 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix appearance of members pagination, copy fix [SCI-6265] (#3792)

Browse source
This commit is contained in:
artoscinote 2022-02-02 10:41:29 +01:00 • committed by GitHub
parent 3c165996fa
commit f1e04cc604
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/my_modules/repositories.js
View file

@ -174,7 +174,7 @@ var MyModuleRepositories = (function() {
fnInitComplete: function() { fnInitComplete: function() {
var dataTableWrapper = $(tableContainer).closest('.dataTables_wrapper'); var dataTableWrapper = $(tableContainer).closest('.dataTables_wrapper');
DataTableHelpers.initLengthApearance(dataTableWrapper); DataTableHelpers.initLengthAppearance(dataTableWrapper);
DataTableHelpers.initSearchField(dataTableWrapper, I18n.t('repositories.show.filter_inventory_items')); DataTableHelpers.initSearchField(dataTableWrapper, I18n.t('repositories.show.filter_inventory_items'));
$('<img class="barcode-scanner" src="/images/icon_small/barcode.png"></img>').appendTo($('.search-container')); $('<img class="barcode-scanner" src="/images/icon_small/barcode.png"></img>').appendTo($('.search-container'));
dataTableWrapper.find('.main-actions, .pagination-row').removeClass('hidden'); dataTableWrapper.find('.main-actions, .pagination-row').removeClass('hidden');

2
app/assets/javascripts/reports/reports_datatable.js
View file

@ -261,7 +261,7 @@
fnDrawCallback: tableDrowCallback, fnDrawCallback: tableDrowCallback,
createdRow: addAttributesToRow, createdRow: addAttributesToRow,
fnInitComplete: function() { fnInitComplete: function() {
DataTableHelpers.initLengthApearance($table.closest('.dataTables_wrapper')); DataTableHelpers.initLengthAppearance($table.closest('.dataTables_wrapper'));
$('.pagination-row').removeClass('hidden'); $('.pagination-row').removeClass('hidden');
$('.report-row.processing').each(function() { $('.report-row.processing').each(function() {
setTimeout(() => { checkProcessingStatus($(this).data('id')); }, START_POLLING_INTERVAL); setTimeout(() => { checkProcessingStatus($(this).data('id')); }, START_POLLING_INTERVAL);

2
app/assets/javascripts/repositories/index.js
View file

@ -96,7 +96,7 @@
updateActionButtons(); updateActionButtons();
} }
}); });
DataTableHelpers.initLengthApearance(dataTableWrapper); DataTableHelpers.initLengthAppearance(dataTableWrapper);
DataTableHelpers.initSearchField(dataTableWrapper, I18n.t('repositories.index.filter_inventory')); DataTableHelpers.initSearchField(dataTableWrapper, I18n.t('repositories.index.filter_inventory'));
$('.content-body .toolbar').html($('#repositoriesListButtons').html()); $('.content-body .toolbar').html($('#repositoriesListButtons').html());
dataTableWrapper.find('.main-actions, .pagination-row').removeClass('hidden'); dataTableWrapper.find('.main-actions, .pagination-row').removeClass('hidden');

2
app/assets/javascripts/repositories/repository_datatable.js
View file

@ -573,7 +573,7 @@ var RepositoryDatatable = (function(global) {
initSaveButton(); initSaveButton();
initCancelButton(); 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')); DataTableHelpers.initSearchField($(TABLE_ID).closest('.dataTables_wrapper'), I18n.t('repositories.show.filter_inventory_items'));
$('<img class="barcode-scanner" src="/images/icon_small/barcode.png"></img>').appendTo($('.search-container')); $('<img class="barcode-scanner" src="/images/icon_small/barcode.png"></img>').appendTo($('.search-container'));

2
app/assets/javascripts/sitewide/datatable_helpers.js
View file

@ -2,7 +2,7 @@
var DataTableHelpers = (function() { var DataTableHelpers = (function() {
return { return {
initLengthApearance: function(dataTableWraper) { initLengthAppearance: function(dataTableWraper) {
var tableLengthSelect = $(dataTableWraper).find('.dataTables_length select'); var tableLengthSelect = $(dataTableWraper).find('.dataTables_length select');
if (tableLengthSelect.val() == null) { if (tableLengthSelect.val() == null) {
tableLengthSelect.val(10).change(); tableLengthSelect.val(10).change();

2
config/locales/en.yml
View file

@ -2519,7 +2519,7 @@ en:
experiment_annotation_message_html: "Project: %{project} | Experiment: %{experiment}" experiment_annotation_message_html: "Project: %{project} | Experiment: %{experiment}"
project_comment_annotation_title: "%{user} mentioned you in a comment on project %{project}." project_comment_annotation_title: "%{user} mentioned you in a comment on project %{project}."
project_annotation_message_html: "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_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_title: "%{user} mentioned you in a comment on task %{my_module}."
my_module_comment_annotation_message_html: "Project: %{project} | Experiment: %{experiment} | Task: %{my_module}" my_module_comment_annotation_message_html: "Project: %{project} | Experiment: %{experiment} | Task: %{my_module}"