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

Fixed bugs with duplicated generated csv, toggle columns and exportig right columns of selected repository

Browse source
This commit is contained in:
rekonder 2017-06-08 23:31:43 +02:00 • committed by Matej Zrimšek
parent ede744849b
commit 4df8e1ffe3
3 changed files with 15 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -226,7 +226,8 @@ $('form#form-export').submit(function(e) {
appendSamplesIdToForm(form); appendSamplesIdToForm(form);
// Append visible column information // Append visible column information
$('table#repository-table thead tr').children('th').each(function(i) { $('.active table#repository-table thead tr').children('th')
.each(function(i) {
var th = $(this); var th = $(this);
var val; var val;
if ($(th).attr('id') === 'checkbox' || $(th).attr('id') === 'assigned') if ($(th).attr('id') === 'checkbox' || $(th).attr('id') === 'assigned')
@ -685,26 +686,7 @@ function updateButtons() {
$('th').removeClass('disable-click'); $('th').removeClass('disable-click');
$('.repository-row-selector').removeClass('disabled'); $('.repository-row-selector').removeClass('disabled');
$('.repository-row-selector').prop('disabled', false); $('.repository-row-selector').prop('disabled', false);
if (rowsSelected.length === 1) { if (rowsSelected.length === 0) {
$('#editRepositoryRecord').prop('disabled', false);
$('#editRepositoryRecord').removeClass('disabled');
$('#deleteRepositoryRecordsButton').prop('disabled', false);
$('#deleteRepositoryRecordsButton').removeClass('disabled');
$('#exportRepositoriesButton').removeClass('disabled');
$('#exportRepositoriesButton').prop('disabled', false);
$('#exportRepositoriesButton').on('click', function() {
$('#exportRepositoryModal')
.modal('show')
});
$('#export-repositories').on('click', function() {
animateSpinner(null, true);
$('#form-export').submit();
});
$('#assignRepositoryRecords').removeClass('disabled');
$('#assignRepositoryRecords').prop('disabled', false);
$('#unassignRepositoryRecords').removeClass('disabled');
$('#unassignRepositoryRecords').prop('disabled', false);
} else if (rowsSelected.length === 0) {
$('#editRepositoryRecord').prop('disabled', true); $('#editRepositoryRecord').prop('disabled', true);
$('#editRepositoryRecord').addClass('disabled'); $('#editRepositoryRecord').addClass('disabled');
$('#deleteRepositoryRecordsButton').prop('disabled', true); $('#deleteRepositoryRecordsButton').prop('disabled', true);
@ -718,8 +700,13 @@ function updateButtons() {
$('#unassignRepositoryRecords').addClass('disabled'); $('#unassignRepositoryRecords').addClass('disabled');
$('#unassignRepositoryRecords').prop('disabled', true); $('#unassignRepositoryRecords').prop('disabled', true);
} else { } else {
$('#editRepositoryRecord').prop('disabled', true); if (rowsSelected.length === 1) {
$('#editRepositoryRecord').addClass('disabled'); $('#editRepositoryRecord').prop('disabled', false);
$('#editRepositoryRecord').removeClass('disabled');
} else {
$('#editRepositoryRecord').prop('disabled', true);
$('#editRepositoryRecord').addClass('disabled');
}
$('#deleteRepositoryRecordsButton').prop('disabled', false); $('#deleteRepositoryRecordsButton').prop('disabled', false);
$('#deleteRepositoryRecordsButton').removeClass('disabled'); $('#deleteRepositoryRecordsButton').removeClass('disabled');
$('#exportRepositoriesButton').removeClass('disabled'); $('#exportRepositoriesButton').removeClass('disabled');
@ -748,6 +735,7 @@ function updateButtons() {
$('#deleteRepositoryRecordsButton').prop('disabled', true); $('#deleteRepositoryRecordsButton').prop('disabled', true);
$('#exportRepositoriesButton').addClass('disabled'); $('#exportRepositoriesButton').addClass('disabled');
$('#exportRepositoriesButton').off('click'); $('#exportRepositoriesButton').off('click');
$('#export-repositories').off('click');
$('#assignRepositoryRecords').addClass('disabled'); $('#assignRepositoryRecords').addClass('disabled');
$('#assignRepositoryRecords').prop('disabled', true); $('#assignRepositoryRecords').prop('disabled', true);
$('#unassignRepositoryRecords').addClass('disabled'); $('#unassignRepositoryRecords').addClass('disabled');
@ -1045,6 +1033,7 @@ function changeToEditMode() {
if (!_.isEmpty(searchText)) { if (!_.isEmpty(searchText)) {
table.search(searchText).draw(); table.search(searchText).draw();
} }
initRowSelection();
}); });
} }

6
app/controllers/repositories_controller.rb
View file

@ -1,5 +1,5 @@
class RepositoriesController < ApplicationController class RepositoriesController < ApplicationController
before_action :load_vars, except: [:repository_table_index, :export_repository] before_action :load_vars, except: %i(repository_table_index export_repository)
before_action :check_view_all_permissions, only: :index before_action :check_view_all_permissions, only: :index
before_action :check_edit_and_destroy_permissions, only: before_action :check_edit_and_destroy_permissions, only:
%(destroy destroy_modal rename_modal update) %(destroy destroy_modal rename_modal update)
@ -7,7 +7,6 @@ class RepositoriesController < ApplicationController
%(copy_modal copy) %(copy_modal copy)
before_action :check_create_permissions, only: before_action :check_create_permissions, only:
%(create_new_modal create) %(create_new_modal create)
before_action :generate_zip, only: :export_repository
def index def index
render('repositories/index') render('repositories/index')
@ -273,8 +272,7 @@ class RepositoriesController < ApplicationController
sample_row << I18n.l(row.created_at, format: :full) sample_row << I18n.l(row.created_at, format: :full)
else else
record = row_record.joins(:repository_columns, :repository_cells) record = row_record.joins(:repository_columns, :repository_cells)
.where(repository_columns: { id: header }) .where(repository_columns: { id: header }).take
.take
if record if record
sample_row << record.repository_cells.take.value.data sample_row << record.repository_cells.take.value.data
else else

1
app/views/repositories/_repository.html.erb
View file

@ -88,3 +88,4 @@
repository_index_link: repository_table_index_path(repository) repository_index_link: repository_table_index_path(repository)
} }
%> %>