scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-10 16:31:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5448 from aignatov-bio/ai-sci-8413-fix-action-toolbar-init

Browse source 
Fix action toolbar init [SCI-8413]
This commit is contained in:
aignatov-bio 2023-05-23 12:20:16 +02:00 • committed by GitHub
commit cdec8023ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/projects/index.js
View file

@ -240,14 +240,14 @@ var ProjectsIndex = (function() {
} }
function updateProjectsToolbar() { function updateProjectsToolbar() {
window.actionToolbarComponent.fetchActions( if (window.actionToolbarComponent) {
{ window.actionToolbarComponent.fetchActions({
project_ids: selectedProjects, project_ids: selectedProjects,
project_folder_ids: selectedProjectFolders project_folder_ids: selectedProjectFolders
} });
);
window.actionToolbarComponent.setReloadCallback(refreshCurrentView); window.actionToolbarComponent.setReloadCallback(refreshCurrentView);
} }
}
function refreshCurrentView() { function refreshCurrentView() {
loadCardsView(); loadCardsView();

5
app/javascript/packs/vue/action_toolbar.js
View file

@ -1,4 +1,4 @@
/* global I18n */ /* global notTurbolinksPreview */
import TurbolinksAdapter from 'vue-turbolinks'; import TurbolinksAdapter from 'vue-turbolinks';
import Vue from 'vue/dist/vue.esm'; import Vue from 'vue/dist/vue.esm';
@ -8,11 +8,12 @@ Vue.use(TurbolinksAdapter);
window.initActionToolbar = () => { window.initActionToolbar = () => {
if (window.actionToolbarComponent) return; if (window.actionToolbarComponent) return;
if (notTurbolinksPreview()) {
new Vue({ new Vue({
el: '#actionToolbar', el: '#actionToolbar',
components: { components: {
ActionToolbar ActionToolbar
} }
}); });
}
} }