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

Merge pull request #2675 from urbanrotnik/ur-sci-4782

Browse source 
Include archived columns to inventories export [SCI-4782]
This commit is contained in:
Urban Rotnik 2020-06-23 16:51:50 +02:00 committed by GitHub
commit efbc05e00e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -361,6 +361,12 @@ var RepositoryDatatable = (function(global) {
case 'added-on': case 'added-on':
val = -6; val = -6;
break; break;
case 'archived-by':
val = -7;
break;
case 'archived-on':
val = -8;
break;
default: default:
val = th.attr('id'); val = th.attr('id');
} }

8
app/services/repository_zip_export.rb
View file

@ -34,6 +34,10 @@ module RepositoryZipExport
I18n.t('repositories.table.added_by') I18n.t('repositories.table.added_by')
when -6 when -6
I18n.t('repositories.table.added_on') I18n.t('repositories.table.added_on')
when -7
I18n.t('repositories.table.archived_by')
when -8
I18n.t('repositories.table.archived_on')
else else
column = RepositoryColumn.find_by_id(c_id) column = RepositoryColumn.find_by_id(c_id)
column ? column.name : nil column ? column.name : nil
@ -56,6 +60,10 @@ module RepositoryZipExport
row.created_by.full_name row.created_by.full_name
when -6 when -6
I18n.l(row.created_at, format: :full) I18n.l(row.created_at, format: :full)
when -7
row.archived_by.full_name
when -8
I18n.l(row.archived_on, format: :full)
else else
cell = row.repository_cells cell = row.repository_cells
.find_by(repository_column_id: c_id) .find_by(repository_column_id: c_id)