From d917cf3340a506a2f16ec82230c3dd6c9b93e968 Mon Sep 17 00:00:00 2001 From: Nejc Bernot Date: Wed, 5 Jul 2017 11:52:36 +0200 Subject: [PATCH] Renames the WOPI_BREADCRUMBS_HOST env variable to WOPI_USER_HOST --- app/controllers/wopi_controller.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/controllers/wopi_controller.rb b/app/controllers/wopi_controller.rb index 7b954c71e..7bd0490b3 100644 --- a/app/controllers/wopi_controller.rb +++ b/app/controllers/wopi_controller.rb @@ -70,11 +70,11 @@ class WopiController < ActionController::Base UserCanNotWriteRelative: true, CloseUrl: @close_url, DownloadUrl: url_for(controller: 'assets', action: 'download', - id: @asset.id, host: ENV['WOPI_BREADCRUMBS_HOST']), + id: @asset.id, host: ENV['WOPI_USER_HOST']), HostEditUrl: url_for(controller: 'assets', action: 'edit', - id: @asset.id, host: ENV['WOPI_BREADCRUMBS_HOST']), + id: @asset.id, host: ENV['WOPI_USER_HOST']), HostViewUrl: url_for(controller: 'assets', action: 'view', - id: @asset.id, host: ENV['WOPI_BREADCRUMBS_HOST']), + id: @asset.id, host: ENV['WOPI_USER_HOST']), BreadcrumbBrandName: @breadcrumb_brand_name, BreadcrumbBrandUrl: @breadcrumb_brand_url, BreadcrumbFolderName: @breadcrumb_folder_name, @@ -286,21 +286,21 @@ class WopiController < ActionController::Base if @protocol.in_module? @close_url = protocols_my_module_url(@protocol.my_module, only_path: false, - host: ENV['WOPI_BREADCRUMBS_HOST']) + host: ENV['WOPI_USER_HOST']) project = @protocol.my_module.experiment.project @breadcrumb_brand_name = project.name @breadcrumb_brand_url = project_url(project, only_path: false, - host: ENV['WOPI_BREADCRUMBS_HOST']) + host: ENV['WOPI_USER_HOST']) @breadcrumb_folder_name = @protocol.my_module.name else @close_url = protocols_url(only_path: false, - host: ENV['WOPI_BREADCRUMBS_HOST']) + host: ENV['WOPI_USER_HOST']) @breadcrump_brand_name = 'Projects' @breadcrumb_brand_url = root_url(only_path: false, - host: ENV['WOPI_BREADCRUMBS_HOST']) + host: ENV['WOPI_USER_HOST']) @breadcrumb_folder_name = 'Protocol managament' end @breadcrumb_folder_url = @close_url @@ -310,12 +310,12 @@ class WopiController < ActionController::Base @close_url = results_my_module_url(@my_module, only_path: false, - host: ENV['WOPI_BREADCRUMBS_HOST']) + host: ENV['WOPI_USER_HOST']) @breadcrumb_brand_name = @my_module.experiment.project.name @breadcrumb_brand_url = project_url(@my_module.experiment.project, only_path: false, - host: ENV['WOPI_BREADCRUMBS_HOST']) + host: ENV['WOPI_USER_HOST']) @breadcrumb_folder_name = @my_module.name @breadcrumb_folder_url = @close_url end