From 0aa1c32813337e8933d9871aa0dbabf7acbefc99 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Thu, 21 May 2020 16:51:07 +0200 Subject: [PATCH 1/2] Fix ordering in simple table view --- app/assets/javascripts/my_modules/repositories.js | 12 ++++++------ app/helpers/repository_datatable_helper.rb | 2 +- .../repositories/_repositories_list.html.erb | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/my_modules/repositories.js b/app/assets/javascripts/my_modules/repositories.js index 6dde1d3f1..ca43fbf2b 100644 --- a/app/assets/javascripts/my_modules/repositories.js +++ b/app/assets/javascripts/my_modules/repositories.js @@ -95,7 +95,7 @@ var MyModuleRepositories = (function() { serverSide: true, responsive: true, pageLength: 5, - order: [[1, 'asc']], + order: [[0, 'asc']], sScrollY: '100%', sScrollX: '100%', sScrollXInner: '100%', @@ -103,6 +103,7 @@ var MyModuleRepositories = (function() { ajax: { url: $(tableContainer).data('source'), data: function(d) { + d.order[0].column = 3; d.assigned = 'assigned'; d.view_mode = true; d.simple_view = true; @@ -110,11 +111,8 @@ var MyModuleRepositories = (function() { global: false, type: 'POST' }, - columns: [ - { data: '1' } - ], columnDefs: [{ - targets: 1, + targets: 0, render: function(data, type, row) { return "" + data + ''; @@ -124,7 +122,9 @@ var MyModuleRepositories = (function() { var repositoryContainer = $(this).closest('.assigned-repository-container'); repositoryContainer.find('.table.dataTable').removeClass('hidden'); repositoryContainer.find('.version-label').html(tableContainer.data('version-label')); - SIMPLE_TABLE.columns.adjust(); + setTimeout(function() { + SIMPLE_TABLE.columns.adjust(); + }, 500); } }); } diff --git a/app/helpers/repository_datatable_helper.rb b/app/helpers/repository_datatable_helper.rb index c0065a3dc..c82815b6a 100644 --- a/app/helpers/repository_datatable_helper.rb +++ b/app/helpers/repository_datatable_helper.rb @@ -37,7 +37,7 @@ module RepositoryDatatableHelper repository_rows.map do |record| { 'DT_RowId': record.id, - '1': escape_input(record.name), + '0': escape_input(record.name), 'recordInfoUrl': Rails.application.routes.url_helpers.repository_repository_row_path(record.repository, record) } end diff --git a/app/views/my_modules/repositories/_repositories_list.html.erb b/app/views/my_modules/repositories/_repositories_list.html.erb index 9955e5d55..033c1c0c1 100644 --- a/app/views/my_modules/repositories/_repositories_list.html.erb +++ b/app/views/my_modules/repositories/_repositories_list.html.erb @@ -30,7 +30,6 @@ - From cbc578f84b1409a8ccbdc039add8f791cf4093df Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Fri, 22 May 2020 15:10:21 +0200 Subject: [PATCH 2/2] Fix snapshot name column id --- app/assets/javascripts/my_modules/repositories.js | 9 ++++----- app/helpers/my_modules_helper.rb | 4 ++++ .../my_modules/repositories/_repositories_list.html.erb | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/my_modules/repositories.js b/app/assets/javascripts/my_modules/repositories.js index ca43fbf2b..b508a596a 100644 --- a/app/assets/javascripts/my_modules/repositories.js +++ b/app/assets/javascripts/my_modules/repositories.js @@ -103,7 +103,7 @@ var MyModuleRepositories = (function() { ajax: { url: $(tableContainer).data('source'), data: function(d) { - d.order[0].column = 3; + d.order[0].column = tableContainer.data('name-column-id'); d.assigned = 'assigned'; d.view_mode = true; d.simple_view = true; @@ -122,9 +122,7 @@ var MyModuleRepositories = (function() { var repositoryContainer = $(this).closest('.assigned-repository-container'); repositoryContainer.find('.table.dataTable').removeClass('hidden'); repositoryContainer.find('.version-label').html(tableContainer.data('version-label')); - setTimeout(function() { - SIMPLE_TABLE.columns.adjust(); - }, 500); + SIMPLE_TABLE.columns.adjust(); } }); } @@ -280,11 +278,12 @@ var MyModuleRepositories = (function() { } function initSimpleTable() { - $('#assigned-items-container').on('show.bs.collapse', '.assigned-repository-container', function() { + $('#assigned-items-container').on('shown.bs.collapse', '.assigned-repository-container', function() { var repositoryContainer = $(this); var repositoryTemplate = $($('#myModuleRepositorySimpleTemplate').html()); repositoryTemplate.attr('data-source', $(this).data('repository-url')); repositoryTemplate.attr('data-version-label', $(this).data('footer-label')); + repositoryTemplate.attr('data-name-column-id', $(this).data('name-column-id')); repositoryContainer.html(repositoryTemplate); renderSimpleTable(repositoryTemplate); }); diff --git a/app/helpers/my_modules_helper.rb b/app/helpers/my_modules_helper.rb index b6c79b559..f467093de 100644 --- a/app/helpers/my_modules_helper.rb +++ b/app/helpers/my_modules_helper.rb @@ -96,4 +96,8 @@ module MyModulesHelper t('my_modules.repository.snapshots.simple_view.live_bottom_label') end + + def assigned_repository_simple_view_name_column_id(repository) + repository.is_a?(RepositorySnapshot) ? 2 : 3 + end end diff --git a/app/views/my_modules/repositories/_repositories_list.html.erb b/app/views/my_modules/repositories/_repositories_list.html.erb index 033c1c0c1..7da11b4de 100644 --- a/app/views/my_modules/repositories/_repositories_list.html.erb +++ b/app/views/my_modules/repositories/_repositories_list.html.erb @@ -21,6 +21,7 @@ id="assigned-repository-items-container-<%= repository.id %>" data-repository-url="<%= assigned_repository_simple_view_index_path(@my_module, repository) %>" data-footer-label="<%= assigned_repository_simple_view_footer_label(repository) %>" + data-name-column-id="<%= assigned_repository_simple_view_name_column_id(repository) %>" >