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 fixes

Browse source
This commit is contained in:
Martin Artnik 2024-05-30 14:36:57 +02:00
parent 871ef9806a
commit a944de12a8
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/assets_controller.rb
View file

@ -18,7 +18,7 @@ class AssetsController < ApplicationController
before_action :load_vars, except: :create_wopi_file before_action :load_vars, except: :create_wopi_file
before_action :check_read_permission, except: %i(edit destroy duplicate create_wopi_file toggle_view_mode) before_action :check_read_permission, except: %i(edit destroy duplicate create_wopi_file toggle_view_mode)
before_action :check_edit_permission, only: %i(edit destroy duplicate rename toggle_view_mode) before_action :check_manage_permission, only: %i(edit destroy duplicate rename toggle_view_mode)
def file_preview def file_preview
render json: { html: render_to_string( render json: { html: render_to_string(

3
config/locales/global_activities/en.yml
View file

@ -591,15 +591,12 @@ en:
edit_image_on_inventory_item: "Inventory item image edited" edit_image_on_inventory_item: "Inventory item image edited"
edit_wopi_file_on_inventory_item: "Inventory item wopi file edited" edit_wopi_file_on_inventory_item: "Inventory item wopi file edited"
export_inventory_stock_consumption: "Inventory stock consumptions exported" export_inventory_stock_consumption: "Inventory stock consumptions exported"
<<<<<<< HEAD
task_step_asset_renamed: "File attachment on Task step renamed" task_step_asset_renamed: "File attachment on Task step renamed"
protocol_step_asset_renamed: "File attachment on Protocol step renamed" protocol_step_asset_renamed: "File attachment on Protocol step renamed"
result_asset_renamed: "File attachment on Task result renamed" result_asset_renamed: "File attachment on Task result renamed"
=======
task_step_file_duplicated: "File attachment on Task step duplicated" task_step_file_duplicated: "File attachment on Task step duplicated"
result_file_duplicated: "File attachment on Task result duplicated" result_file_duplicated: "File attachment on Task result duplicated"
protocol_step_file_duplicated: "File attachment on Protocol step duplicated" protocol_step_file_duplicated: "File attachment on Protocol step duplicated"
>>>>>>> ea4c356e1 (Add file duplicate activities [SCI-10257])
activity_group: activity_group:
projects: "Projects" projects: "Projects"
task_results: "Task results" task_results: "Task results"