scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-25 01:03:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix the loading order of the actions toolbar [SCI-9981] (#7019)

Browse source
This commit is contained in:
Soufiane 2024-01-30 14:45:36 +01:00 committed by GitHub
parent 5bc542e834
commit 2f997cdd78
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/reports/reports_datatable.js
View file

@ -224,7 +224,7 @@
}, },
createdRow: addAttributesToRow, createdRow: addAttributesToRow,
initComplete: function(settings) { initComplete: function(settings) {
initActionToolbar(); window.initActionToolbar();
actionToolbarComponent.setBottomOffset(68); actionToolbarComponent.setBottomOffset(68);
const { nTableWrapper: dataTableWrapper } = settings; const { nTableWrapper: dataTableWrapper } = settings;

2
app/views/label_templates/index.html.erb
View file

@ -55,6 +55,6 @@
<%= render partial: "index_toolbar" %> <%= render partial: "index_toolbar" %>
<%= render partial: "delete_modal" %> <%= render partial: "delete_modal" %>
<%= javascript_include_tag 'label_templates/label_templates_datatable' %>
<%= javascript_include_tag 'vue_components_action_toolbar' %> <%= javascript_include_tag 'vue_components_action_toolbar' %>
<%= javascript_include_tag 'label_templates/label_templates_datatable' %>
<% end %> <% end %>

2
app/views/reports/index.html.erb
View file

@ -68,8 +68,8 @@
<%= render partial: 'reports/modals/regenerate' %> <%= render partial: 'reports/modals/regenerate' %>
<%= javascript_include_tag "vue_components_action_toolbar" %>
<%= javascript_include_tag 'reports/save_pdf_to_inventory' %> <%= javascript_include_tag 'reports/save_pdf_to_inventory' %>
<%= javascript_include_tag 'reports/reports_datatable' %> <%= javascript_include_tag 'reports/reports_datatable' %>
<%= javascript_include_tag 'pdf_js' %> <%= javascript_include_tag 'pdf_js' %>
<%= stylesheet_link_tag 'pdf_js_styles' %> <%= stylesheet_link_tag 'pdf_js_styles' %>
<%= javascript_include_tag "vue_components_action_toolbar" %>

2
app/views/repositories/index.html.erb
View file

@ -61,7 +61,7 @@
<action-toolbar actions-url="<%= actions_toolbar_team_repositories_url(current_team) %>" /> <action-toolbar actions-url="<%= actions_toolbar_team_repositories_url(current_team) %>" />
</div> </div>
<%= javascript_include_tag "vue_components_action_toolbar" %>
<%= javascript_include_tag "repositories/index" %> <%= javascript_include_tag "repositories/index" %>
<%= javascript_include_tag "repositories/share_modal" %> <%= javascript_include_tag "repositories/share_modal" %>
<%= stylesheet_link_tag 'datatables' %> <%= stylesheet_link_tag 'datatables' %>
<%= javascript_include_tag "vue_components_action_toolbar" %>