X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9aff8a3624b463d3fd4d9302c4d41c7558df4a13..0dab89df8040f203a33bc1922df0ff893791def7:/apps/workbench/app/views/layouts/application.html.erb
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index b59bad4ec1..93ce592679 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -3,14 +3,14 @@
SPDX-License-Identifier: AGPL-3.0 %>
-
+
<% if content_for? :page_title %>
- <%= yield :page_title %> / <%= Rails.configuration.site_name %>
+ <%= yield :page_title %> / <%= Rails.configuration.Workbench.SiteName %>
<% else %>
- <%= Rails.configuration.site_name %>
+ <%= Rails.configuration.Workbench.SiteName %>
<% end %>
@@ -20,7 +20,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
<% if current_user %>
<% content_for :js do %>
- window.defaultSession = <%=raw({baseURL: Rails.configuration.arvados_v1_base.sub(/\/arvados\/v1$/, '/'), token: Thread.current[:arvados_api_token], user: current_user}.to_json)%>
+ window.defaultSession = <%=raw({baseURL: Rails.configuration.Services.Controller.ExternalURL.to_s.sub(/\/*$/,'/'), token: Thread.current[:arvados_api_token], user: current_user}.to_json)%>
<% end %>
<% end %>
<% if current_user and $arvados_api_client.discovery[:websocketUrl] %>
@@ -32,8 +32,8 @@ SPDX-License-Identifier: AGPL-3.0 %>
social graph that search engines can use. http://ogp.me/ %>
-
- <% if @object %>
+
+ <% if defined?(@object) && @object %>
<% if @object.respond_to?(:name) and @object.name.present? %>
<% end %>
@@ -49,7 +49,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
<%= yield :head %>
<%= javascript_tag do %>
angular.module('Arvados').value('arvadosApiToken', '<%=Thread.current[:arvados_api_token]%>');
- angular.module('Arvados').value('arvadosDiscoveryUri', '<%= Rails.configuration.arvados_v1_base.sub '/arvados/v1', '/discovery/v1/apis/arvados/v1/rest' %>');
+ angular.module('Arvados').value('arvadosDiscoveryUri', '<%= Rails.configuration.Services.Controller.ExternalURL.to_s.sub(/\/*$/,'/') + 'discovery/v1/apis/arvados/v1/rest' %>');
<%= yield :js %>
<% end %>