projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1977-provenance-report' of git.clinicalfuture.com:arvados into 1977...
[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 fe7012aa94b0c8218ab2675c7c5c19f29f732df5..a42016b8eca0cc4a70ead39b1dbc4ff07cf0bb23 100644
(file)
--- a/
apps/workbench/app/helpers/application_helper.rb
+++ b/
apps/workbench/app/helpers/application_helper.rb
@@
-56,10
+56,7
@@
module ApplicationHelper
if opts[:friendly_name]
begin
if opts[:friendly_name]
begin
- friendly_name = resource_class.find(link_uuid).friendly_link_name
- if friendly_name and not friendly_name.empty?
- link_name = friendly_name
- end
+ link_name = resource_class.find(link_uuid).friendly_link_name
rescue RuntimeError
# If that lookup failed, the link will too. So don't make one.
return attrvalue
rescue RuntimeError
# If that lookup failed, the link will too. So don't make one.
return attrvalue