projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15877-accept-json-in-json'
[arvados.git]
/
apps
/
workbench
/
app
/
helpers
/
application_helper.rb
diff --git
a/apps/workbench/app/helpers/application_helper.rb
b/apps/workbench/app/helpers/application_helper.rb
index 83123b26c35c469e3efad7ec2833679f55445a39..0a872446d594d42f8485316663b437cbfab0c3c8 100644
(file)
--- a/
apps/workbench/app/helpers/application_helper.rb
+++ b/
apps/workbench/app/helpers/application_helper.rb
@@
-12,11
+12,11
@@
module ApplicationHelper
end
def current_api_host
end
def current_api_host
- Rails.configuration.arvados_v1_base.gsub(/https?:\/\/|\/arvados\/v1/, '')
+ "#{Rails.configuration.Services.Controller.ExternalURL.hostname}:#{Rails.configuration.Services.Controller.ExternalURL.port}"
end
def current_uuid_prefix
end
def current_uuid_prefix
- current_api_host[0..4]
+ Rails.configuration.ClusterID
end
def render_markup(markup)
end
def render_markup(markup)
@@
-359,8
+359,8
@@
module ApplicationHelper
display_value = link.name
elsif value_info[:link_name]
display_value = value_info[:link_name]
display_value = link.name
elsif value_info[:link_name]
display_value = value_info[:link_name]
- elsif
value_info[:selection_name]
- display_value =
value_info[:selection_name]
+ elsif
(sn = value_info[:selection_name]) && sn != ""
+ display_value =
sn
end
end
if (attr == :components) and (subattr.size > 2)
end
end
if (attr == :components) and (subattr.size > 2)