projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3136: Fetch actual job objects for use in rendering pipeline jobs.
[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 78727923070ae66d2c1051b03bd31ea399370e35..e3f6fdc3c9ceda44dd31ee09dc02216451fcdd47 100644
(file)
--- a/
apps/workbench/app/helpers/application_helper.rb
+++ b/
apps/workbench/app/helpers/application_helper.rb
@@
-107,6
+107,9
@@
module ApplicationHelper
end
end
end
end
end
end
+ if link_name.nil? or link_name.empty?
+ link_name = attrvalue
+ end
if opts[:with_class_name]
link_name = "#{resource_class.to_s}: #{link_name}"
end
if opts[:with_class_name]
link_name = "#{resource_class.to_s}: #{link_name}"
end
@@
-133,9
+136,6
@@
module ApplicationHelper
if opts[:no_link]
raw(link_name)
else
if opts[:no_link]
raw(link_name)
else
- if link_name.nil? or link_name.empty?
- link_name = "(unnamed)"
- end
(link_to raw(link_name), { controller: resource_class.to_s.tableize, action: 'show', id: ((opts[:name_link].andand.uuid) || link_uuid) }, style_opts) + raw(tags)
end
else
(link_to raw(link_name), { controller: resource_class.to_s.tableize, action: 'show', id: ((opts[:name_link].andand.uuid) || link_uuid) }, style_opts) + raw(tags)
end
else
@@
-186,8
+186,6
@@
module ApplicationHelper
@unique_id ||= (Time.now.to_f*1000000).to_i
span_id = object.uuid.to_s + '-' + attr.to_s + '-' + (@unique_id += 1).to_s
@unique_id ||= (Time.now.to_f*1000000).to_i
span_id = object.uuid.to_s + '-' + attr.to_s + '-' + (@unique_id += 1).to_s
- puts "Span #{object.inspect} #{(object.andand.default_name || 'none')}"
-
span_tag = content_tag 'span', attrvalue.to_s, {
"data-emptytext" => ('(none)'),
"data-placement" => "bottom",
span_tag = content_tag 'span', attrvalue.to_s, {
"data-emptytext" => ('(none)'),
"data-placement" => "bottom",