scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-27 02:04:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix snapshot name column id

Browse source
This commit is contained in:
aignatov-bio 2020-05-22 15:10:21 +02:00
parent 0aa1c32813
commit cbc578f84b
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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);
});

4
app/helpers/my_modules_helper.rb
View file

@ -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

1
app/views/my_modules/repositories/_repositories_list.html.erb
View file

@ -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) %>"
>
</div>
</div>