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

Merge pull request #2709 from urbanrotnik/ur-sci-4804

Browse source 
Fix Repository rows count & table header adjustmen [SCI-4804]
This commit is contained in:
Urban Rotnik 2020-07-08 11:39:44 +02:00 • committed by GitHub
commit 33aa1d3641
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -306,7 +306,7 @@ var MyModuleRepositories = (function() {
renderSimpleTable(repositoryTemplate);
});
$('.navbar-secondary').on('sideBar::shown sideBar::hidden', function() {
$('#wrapper').on('sideBar::shown sideBar::hidden', function() {
if (SIMPLE_TABLE) {
SIMPLE_TABLE.columns.adjust();
}

7
app/assets/javascripts/repositories/index.js
View file

@ -175,6 +175,13 @@
});
});
$('#wrapper').on('sideBar::hidden sideBar::shown', function() {
if (REPOSITORIES_TABLE) {
REPOSITORIES_TABLE.columns.adjust();
}
});
$('.create-new-repository').initializeModal('#create-repo-modal');
initRepositoriesDataTable('#repositoriesList', $('.repositories-index').hasClass('archived'));
initRepositoryViewSwitcher();

4
app/assets/javascripts/sidebar_toggle.js.erb
View file

@ -35,8 +35,8 @@
sideBarEvent = 'sideBar::shown'
}
$('.navbar-secondary').one("transitionend",function(event) {
$('.navbar-secondary').trigger(sideBarEvent);
$('#wrapper').one("transitionend", function() {
$('#wrapper').trigger(sideBarEvent);
})
}

2
app/helpers/repositories_datatable_helper.rb
View file

@ -10,7 +10,7 @@ module RepositoriesDatatableHelper
result.push(
'DT_RowId': repository.id,
'1': escape_input(repository.name),
'2': repository.repository_rows.size,
'2': repository.active? ? repository.repository_rows.active.size : repository.repository_rows.size,
'3': shared_label(repository, team),
'4': escape_input(repository.team.name),
'5': {