scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-22 23:03:00 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge

Browse source
This commit is contained in:
Anton 2024-06-05 16:33:12 +02:00
parent 49d0f9e6b8
commit 4c4fcd68ae
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/assets_controller.rb
View file

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