scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-10 14:46:42 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #701 from mz3944/mz-SCI-1383

Browse source 
Removed empty first column of repository export file [SCI-1383]
This commit is contained in:
mz3944 2017-06-21 10:57:46 +02:00 committed by GitHub
commit 568e41f5fa
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -231,15 +231,18 @@ $('form#form-export').submit(function() {
case 'checkbox':
val = -1;
break;
case 'row-name':
case 'assigned':
val = -2;
break;
case 'added-by':
case 'row-name':
val = -3;
break;
case 'added-on':
case 'added-by':
val = -4;
break;
case 'added-on':
val = -5;
break;
default:
val = th.attr('id');
}

16
app/controllers/repositories_controller.rb
View file

@ -250,13 +250,13 @@ class RepositoriesController < ApplicationController
csv_header = []
column_ids.each do |c_id|
csv_header << case c_id.to_i
when -1
when -1, -2
next
when -2
I18n.t('repositories.table.row_name')
when -3
I18n.t('repositories.table.added_by')
I18n.t('repositories.table.row_name')
when -4
I18n.t('repositories.table.added_by')
when -5
I18n.t('repositories.table.added_on')
else
column = RepositoryColumn.find_by_id(c_id)
@ -270,13 +270,13 @@ class RepositoriesController < ApplicationController
csv_row = []
column_ids.each do |c_id|
csv_row << case c_id.to_i
when -1
when -1, -2
next
when -2
row.name
when -3
row.created_by.full_name
row.name
when -4
row.created_by.full_name
when -5
I18n.l(row.created_at, format: :full)
else
cell = row.repository_cells