scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix result with WOPI file creation [SCI-7073]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2022-08-09 17:43:27 +02:00
parent f67654ffeb
commit d178bc38a6
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/permissions/asset.rb
View file

@ -22,7 +22,7 @@ Canaid::Permissions.register_for(Asset) do
when Step when Step
can_manage_step?(user, object) can_manage_step?(user, object)
when Result when Result
can_manage_result?(object) can_manage_result?(user, object)
when RepositoryCell when RepositoryCell
if object.repository_column.repository.is_a?(RepositorySnapshot) if object.repository_column.repository.is_a?(RepositorySnapshot)
false false

8
app/serializers/asset_serializer.rb
View file

@ -104,7 +104,6 @@ class AssetSerializer < ActiveModel::Serializer
end end
def urls def urls
@user = scope[:user] || @instance_options[:user]
urls = { urls = {
preview: asset_file_preview_path(object), preview: asset_file_preview_path(object),
download: rails_blob_path(object.file, disposition: 'attachment'), download: rails_blob_path(object.file, disposition: 'attachment'),
@ -113,7 +112,8 @@ class AssetSerializer < ActiveModel::Serializer
marvin_js: marvin_js_asset_path(object), marvin_js: marvin_js_asset_path(object),
marvin_js_icon: image_path('icon_small/marvinjs.svg') marvin_js_icon: image_path('icon_small/marvinjs.svg')
} }
if can_manage_asset?(@user, object) user = scope[:user] || @instance_options[:user]
if can_manage_asset?(user, object)
urls.merge!( urls.merge!(
toggle_view_mode: toggle_view_mode_path(object), toggle_view_mode: toggle_view_mode_path(object),
edit_asset: edit_asset_path(object), edit_asset: edit_asset_path(object),
@ -122,9 +122,7 @@ class AssetSerializer < ActiveModel::Serializer
delete: asset_destroy_path(object) delete: asset_destroy_path(object)
) )
end end
if wopi && can_manage_asset?(@user, object) urls[:wopi_action] = object.get_action_url(user, 'embedview') if wopi && can_manage_asset?(user, object)
urls[:wopi_action] = object.get_action_url(@user, 'embedview')
end
urls[:blob] = rails_blob_path(object.file, disposition: 'attachment') if object.file.attached? urls[:blob] = rails_blob_path(object.file, disposition: 'attachment') if object.file.attached?
urls urls