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

Merge pull request #5810 from aignatov-bio/ai-sci-8890-fix-js-error-in-console-log

Browse source 
Fix js error in console log [SCI-8890]
This commit is contained in:
aignatov-bio 2023-07-19 09:57:46 +02:00 • committed by GitHub
commit 03225bbd7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/experiments/table.js
View file

@ -499,7 +499,9 @@ var ExperimnetTable = {
}); });
}, },
updateExperimentToolbar: function() { updateExperimentToolbar: function() {
if (window.actionToolbarComponent) {
window.actionToolbarComponent.fetchActions({ my_module_ids: this.selectedMyModules }); window.actionToolbarComponent.fetchActions({ my_module_ids: this.selectedMyModules });
}
}, },
selectDate: function($field) { selectDate: function($field) {
var datePicker = $field.data('DateTimePicker'); var datePicker = $field.data('DateTimePicker');

2
app/assets/javascripts/label_templates/label_templates_datatable.js
View file

@ -144,9 +144,11 @@
} }
function updateButtons() { function updateButtons() {
if (window.actionToolbarComponent) {
window.actionToolbarComponent.fetchActions({ label_template_ids: rowsSelectedIDs() }); window.actionToolbarComponent.fetchActions({ label_template_ids: rowsSelectedIDs() });
$('.dataTables_scrollBody').css('padding-bottom', `${rowsSelectedIDs().length > 0 ? 68 : 0}px`); $('.dataTables_scrollBody').css('padding-bottom', `${rowsSelectedIDs().length > 0 ? 68 : 0}px`);
} }
}
function reloadTable() { function reloadTable() {
LABEL_TEMPLATE_TABLE.ajax.reload(null, false); LABEL_TEMPLATE_TABLE.ajax.reload(null, false);

2
app/javascript/vue/navigation/navigator_item.vue
View file

@ -114,7 +114,7 @@ export default {
} }
}, },
children: function() { children: function() {
if (this.children.length > 0) { if (this.children && this.children.length > 0) {
this.childrenExpanded = true; this.childrenExpanded = true;
} else if (this.childrenLoaded) { } else if (this.childrenLoaded) {
this.item.has_children = false; this.item.has_children = false;