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

Merge pull request #2569 from aignatov-bio/ai-sci-4613-add-title-for-assign-modal

Browse source 
Add a title for full view assign modal [SCI-4613]
This commit is contained in:
aignatov-bio 2020-05-18 11:15:36 +02:00 • committed by GitHub
commit 2b3dda8ce0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -176,7 +176,8 @@ var MyModuleRepositories = (function() {
FilePreviewModal.init(); FilePreviewModal.init();
renderFullViewRepositoryName( renderFullViewRepositoryName(
tableContainer.attr('data-repository-name'), tableContainer.attr('data-repository-name'),
tableContainer.attr('data-repository-snapshot-created') tableContainer.attr('data-repository-snapshot-created'),
options.assign_mode
); );
updateFullViewRowsCount(tableContainer.attr('data-assigned-items-count')); updateFullViewRowsCount(tableContainer.attr('data-assigned-items-count'));
if (FULL_VIEW_TABLE_SCROLLBAR) { if (FULL_VIEW_TABLE_SCROLLBAR) {
@ -463,11 +464,15 @@ var MyModuleRepositories = (function() {
FULL_VIEW_MODAL.find('.repository-name').attr('data-rows-count', value); FULL_VIEW_MODAL.find('.repository-name').attr('data-rows-count', value);
} }
function renderFullViewRepositoryName(name, snapshotDate) { function renderFullViewRepositoryName(name, snapshotDate, assignMode) {
var title; var title;
var repositoryName = name || FULL_VIEW_MODAL.find('.repository-name').data('repository-name'); var repositoryName = name || FULL_VIEW_MODAL.find('.repository-name').data('repository-name');
if (snapshotDate) { if (assignMode) {
title = I18n.t('my_modules.repository.full_view.assign_modal_header', {
repository_name: repositoryName
});
} else if (snapshotDate) {
title = I18n.t('my_modules.repository.full_view.modal_snapshot_header', { title = I18n.t('my_modules.repository.full_view.modal_snapshot_header', {
repository_name: repositoryName, repository_name: repositoryName,
snaphot_date: snapshotDate snaphot_date: snapshotDate
@ -567,7 +572,7 @@ var MyModuleRepositories = (function() {
HelperModule.flashAlertMsg(data.flash, 'success'); HelperModule.flashAlertMsg(data.flash, 'success');
SELECTED_ROWS = {}; SELECTED_ROWS = {};
$(FULL_VIEW_TABLE.table().container()).find('.dataTable') $(FULL_VIEW_TABLE.table().container()).find('.dataTable')
.attr('data-assigned-items-count', data.rows_count) .attr('data-assigned-items-count', data.rows_count);
FULL_VIEW_TABLE.ajax.reload(null, false); FULL_VIEW_TABLE.ajax.reload(null, false);
reloadRepositoriesList(); reloadRepositoriesList();
renderFullViewAssignButtons(); renderFullViewAssignButtons();

1
config/locales/en.yml
View file

@ -794,6 +794,7 @@ en:
full_view: full_view:
modal_live_header: '%{repository_name}: Live version' modal_live_header: '%{repository_name}: Live version'
modal_snapshot_header: '%{repository_name}: Snapshot of %{snaphot_date}' modal_snapshot_header: '%{repository_name}: Snapshot of %{snaphot_date}'
assign_modal_header: 'Assign from %{repository_name} inventory'
snapshots: snapshots:
simple_view: simple_view:
live_bottom_label: 'Live version' live_bottom_label: 'Live version'