scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-29 03:35:25 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1714 from biosistemika/jg_sci_3380

Browse source 
Add editnew action for editing new office files [SCI-3380]
This commit is contained in:
Jure Grabnar 2019-04-30 09:57:07 +02:00 committed by GitHub
commit b37349624a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/assets_controller.rb
View file

@ -131,8 +131,9 @@ class AssetsController < ApplicationController
end
def edit
action = @asset.file_file_size.zero? && !@asset.locked? ? 'editnew' : 'edit'
@action_url = append_wd_params(@asset
.get_action_url(current_user, 'edit', false))
.get_action_url(current_user, action, false))
@favicon_url = @asset.favicon_url('edit')
tkn = current_user.get_wopi_token
@token = tkn.token

3
app/utilities/wopi_util.rb
View file

@ -55,7 +55,8 @@ module WopiUtil
wopi_app.save!
app.xpath('action').each do |action|
name = action.xpath('@name').first.value
next unless %w(view edit wopitest).include?(name)
next unless %w(view edit editnew wopitest).include?(name)
wopi_action = WopiAction.new
wopi_action.action = name
wopi_action.extension = action.xpath('@ext').first.value