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

Change permission for sorting in steps and asset view [SCI-5289]

Browse source
This commit is contained in:
aignatov-bio 2020-12-08 10:44:52 +01:00
parent 342eb34925
commit 188013dd56
4 changed files with 89 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/assets_controller.rb
View file

@ -17,8 +17,8 @@ class AssetsController < ApplicationController
helper_method :wopi_file_edit_button_status
before_action :load_vars, except: :create_wopi_file
before_action :check_read_permission, except: %i(edit destroy create_wopi_file)
before_action :check_edit_permission, only: %i(edit destroy)
before_action :check_read_permission, except: %i(edit destroy create_wopi_file toggle_view_mode)
before_action :check_edit_permission, only: %i(edit destroy toggle_view_mode)
def file_preview
render json: { html: render_to_string(
@ -191,7 +191,7 @@ class AssetsController < ApplicationController
def destroy
if @asset.destroy
render json: { flash: I18n.t('assets.file_deleted', file_name: @asset.file_name ) }
render json: { flash: I18n.t('assets.file_deleted', file_name: @asset.file_name) }
else
render json: {}, status: :unprocessable_entity
end

5
app/controllers/steps_controller.rb
View file

@ -9,8 +9,9 @@ class StepsController < ApplicationController
before_action :load_vars_nested, only: %i(new create)
before_action :convert_table_contents_to_utf8, only: %i(create update)
before_action :check_view_permissions, only: %i(show update_view_state update_asset_view_mode)
before_action :check_manage_permissions, only: %i(new create edit update destroy move_up move_down)
before_action :check_view_permissions, only: :show
before_action :check_manage_permissions, only: %i(new create edit update destroy move_up move_down
update_view_state update_asset_view_mode)
before_action :check_complete_and_checkbox_permissions, only: %i(toggle_step_state checklistitem_state)
def new

10
app/views/assets/_asset_context_menu.html.erb
View file

@ -1,4 +1,5 @@
<div class="dropdown asset-context-menu">
<% if can_manage_asset?(asset) %>
<div class="dropdown asset-context-menu">
<button class="btn btn-light dropdown-toggle icon-btn" type="button" id="dropdownAssetContextMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<i class="fas fa-ellipsis-h"></i>
</button>
@ -6,7 +7,7 @@
aria-labelledby="dropdownAssetContextMenu"
data-asset-id="<%= asset.id %>"
data-toggle-view-url="<%= toggle_view_mode_path(asset) %>">
<% if can_manage_asset?(asset) && editable %>
<% if editable %>
<% if wopi_enabled? && wopi_file?(asset) %>
<li>
<% edit_supported, title = wopi_file_edit_button_status(asset) %>
@ -57,7 +58,7 @@
</a>
</li>
<% end %>
<% if can_manage_asset?(asset) && deletable %>
<% if deletable %>
<li role="separator" class="divider"></li>
<li>
<a class="delete-asset" href="<%= asset_destroy_path(asset) %>" data-file-name="<%= asset.render_file_name %>">
@ -67,4 +68,5 @@
</li>
<% end %>
</ul>
</div>
</div>
<% end %>

6
app/views/steps/attachments/_list.html.erb
View file

@ -10,7 +10,8 @@
<%= t('protocols.steps.files', count: assets.length) %>
</h4>
</div>
<% unless preview %>
<% if !(preview) && (can_manage_protocol_in_module?(@protocol) ||
can_manage_protocol_in_repository?(@protocol)) %>
<div class="actions">
<div class="dropdown sci-dropdown">
<button class="btn btn-light dropdown-toggle" type="button" id="dropdownAttachmentsOptions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
@ -22,8 +23,6 @@
data-view-mode-url="<%= update_asset_view_mode_step_path(step) %>"
data-step-id="<%= step.id %>"
data-state-save-url="<%= update_view_state_step_path(step.id) %>">
<% if !(preview) && (can_manage_protocol_in_module?(@protocol) ||
can_manage_protocol_in_repository?(@protocol)) %>
<li class="divider-label"><%= t("protocols.steps.attachments.add") %></li>
<li>
<%= render partial: '/assets/marvinjs/create_marvin_sketch_li.html.erb',
@ -34,7 +33,6 @@
locals: { element_id: step.id, element_type: 'Step' } %>
</li>
<li role="separator" class="divider"></li>
<% end %>
<li class="divider-label"><%= t("protocols.steps.attachments.sort_by") %></li>
<% ['new', 'old', 'atoz', 'ztoa'].each do |sort| %>
<li>