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

Merge pull request #732 from biosistemika/business_users

Browse source 
Business users [SCI-1428, SCI-1447]
This commit is contained in:
Nbernot 2017-07-11 13:34:56 +02:00 • committed by GitHub
commit 2a3e830a3c
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/wopi_controller.rb
View file

@ -70,11 +70,11 @@ class WopiController < ActionController::Base
UserCanNotWriteRelative: true, UserCanNotWriteRelative: true,
CloseUrl: @close_url, CloseUrl: @close_url,
DownloadUrl: url_for(controller: 'assets', action: 'download', DownloadUrl: url_for(controller: 'assets', action: 'download',
id: @asset.id), id: @asset.id, host: ENV['WOPI_USER_HOST']),
HostEditUrl: url_for(controller: 'assets', action: 'edit', HostEditUrl: url_for(controller: 'assets', action: 'edit',
id: @asset.id), id: @asset.id, host: ENV['WOPI_USER_HOST']),
HostViewUrl: url_for(controller: 'assets', action: 'view', HostViewUrl: url_for(controller: 'assets', action: 'view',
id: @asset.id), id: @asset.id, host: ENV['WOPI_USER_HOST']),
BreadcrumbBrandName: @breadcrumb_brand_name, BreadcrumbBrandName: @breadcrumb_brand_name,
BreadcrumbBrandUrl: @breadcrumb_brand_url, BreadcrumbBrandUrl: @breadcrumb_brand_url,
BreadcrumbFolderName: @breadcrumb_folder_name, BreadcrumbFolderName: @breadcrumb_folder_name,
@ -286,21 +286,21 @@ class WopiController < ActionController::Base
if @protocol.in_module? if @protocol.in_module?
@close_url = protocols_my_module_url(@protocol.my_module, @close_url = protocols_my_module_url(@protocol.my_module,
only_path: false, only_path: false,
host: ENV['WOPI_BREADCRUMBS_HOST']) host: ENV['WOPI_USER_HOST'])
project = @protocol.my_module.experiment.project project = @protocol.my_module.experiment.project
@breadcrumb_brand_name = project.name @breadcrumb_brand_name = project.name
@breadcrumb_brand_url = project_url(project, @breadcrumb_brand_url = project_url(project,
only_path: false, only_path: false,
host: ENV['WOPI_BREADCRUMBS_HOST']) host: ENV['WOPI_USER_HOST'])
@breadcrumb_folder_name = @protocol.my_module.name @breadcrumb_folder_name = @protocol.my_module.name
else else
@close_url = protocols_url(only_path: false, @close_url = protocols_url(only_path: false,
host: ENV['WOPI_BREADCRUMBS_HOST']) host: ENV['WOPI_USER_HOST'])
@breadcrump_brand_name = 'Projects' @breadcrump_brand_name = 'Projects'
@breadcrumb_brand_url = root_url(only_path: false, @breadcrumb_brand_url = root_url(only_path: false,
host: ENV['WOPI_BREADCRUMBS_HOST']) host: ENV['WOPI_USER_HOST'])
@breadcrumb_folder_name = 'Protocol managament' @breadcrumb_folder_name = 'Protocol managament'
end end
@breadcrumb_folder_url = @close_url @breadcrumb_folder_url = @close_url
@ -310,12 +310,12 @@ class WopiController < ActionController::Base
@close_url = results_my_module_url(@my_module, @close_url = results_my_module_url(@my_module,
only_path: false, only_path: false,
host: ENV['WOPI_BREADCRUMBS_HOST']) host: ENV['WOPI_USER_HOST'])
@breadcrumb_brand_name = @my_module.experiment.project.name @breadcrumb_brand_name = @my_module.experiment.project.name
@breadcrumb_brand_url = project_url(@my_module.experiment.project, @breadcrumb_brand_url = project_url(@my_module.experiment.project,
only_path: false, only_path: false,
host: ENV['WOPI_BREADCRUMBS_HOST']) host: ENV['WOPI_USER_HOST'])
@breadcrumb_folder_name = @my_module.name @breadcrumb_folder_name = @my_module.name
@breadcrumb_folder_url = @close_url @breadcrumb_folder_url = @close_url
end end

7
app/models/asset.rb
View file

@ -380,10 +380,17 @@ class Asset < ActiveRecord::Base
action = get_action(file_ext, action) action = get_action(file_ext, action)
if !action.nil? if !action.nil?
action_url = action.urlsrc action_url = action.urlsrc
if ENV['WOPI_BUSINESS_USERS'] && ENV['WOPI_BUSINESS_USERS']=='true'
action_url = action_url.gsub(/<IsLicensedUser=BUSINESS_USER&>/,
'IsLicensedUser=1&')
action_url = action_url.gsub(/<IsLicensedUser=BUSINESS_USER>/,
'IsLicensedUser=1')
else
action_url = action_url.gsub(/<IsLicensedUser=BUSINESS_USER&>/, action_url = action_url.gsub(/<IsLicensedUser=BUSINESS_USER&>/,
'IsLicensedUser=0&') 'IsLicensedUser=0&')
action_url = action_url.gsub(/<IsLicensedUser=BUSINESS_USER>/, action_url = action_url.gsub(/<IsLicensedUser=BUSINESS_USER>/,
'IsLicensedUser=0') 'IsLicensedUser=0')
end
action_url = action_url.gsub(/<.*?=.*?>/, '') action_url = action_url.gsub(/<.*?=.*?>/, '')
rest_url = Rails.application.routes.url_helpers.wopi_rest_endpoint_url( rest_url = Rails.application.routes.url_helpers.wopi_rest_endpoint_url(