scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-10 15:14:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix pemrisison for acrived rows and download link [SCI-11284][SCI-11285]

Browse source
This commit is contained in:
Anton 2024-11-14 15:33:03 +01:00
parent 162b64e761
commit dfba7adf98
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/vue/shared/file_versions_modal.vue
View file

@ -40,7 +40,7 @@
<div class="basis-1/4 flex justify-end"> <div class="basis-1/4 flex justify-end">
<a class="btn btn-icon p-0 px-2 hover:bg-sn-light-grey" <a class="btn btn-icon p-0 px-2 hover:bg-sn-light-grey"
v-if="enabled || index === 0" v-if="enabled || index === 0"
:href="fileVersion.attributes.url" :href="fileVersion.attributes.download_url"
target="_blank" target="_blank"
data-render-tooltip="true" data-render-tooltip="true"
:title="i18n.t('assets.file_versions_modal.download')" :title="i18n.t('assets.file_versions_modal.download')"

1
app/permissions/asset.rb
View file

@ -27,6 +27,7 @@ Canaid::Permissions.register_for(Asset) do
if object.repository_column.repository.is_a?(RepositorySnapshot) if object.repository_column.repository.is_a?(RepositorySnapshot)
false false
else else
object.repository_row.active? &&
can_manage_repository_assets?(user, object.repository_column.repository) can_manage_repository_assets?(user, object.repository_column.repository)
end end
end end

6
app/serializers/active_storage/blob_serializer.rb
View file

@ -4,7 +4,7 @@ module ActiveStorage
class BlobSerializer < ActiveModel::Serializer class BlobSerializer < ActiveModel::Serializer
include Rails.application.routes.url_helpers include Rails.application.routes.url_helpers
attributes :filename, :extension, :basename, :url, :created_at, :byte_size, :version, :restored_from_version, :created_by attributes :filename, :extension, :basename, :url, :created_at, :byte_size, :version, :restored_from_version, :created_by, :download_url
def basename def basename
object.filename.base object.filename.base
@ -14,6 +14,10 @@ module ActiveStorage
object.filename.extension_without_delimiter object.filename.extension_without_delimiter
end end
def download_url
rails_blob_url(object, disposition: 'attachment')
end
def version def version
object.metadata['version'] || 1 object.metadata['version'] || 1
end end