projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3106-modal-loading-indicator
[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 66267e028d4df4eb5dd1436fcdeb507904e466aa..d1bac0c4cd2d1c8e24d60ef4c34327079643fd8b 100644
(file)
--- a/
apps/workbench/app/helpers/application_helper.rb
+++ b/
apps/workbench/app/helpers/application_helper.rb
@@
-100,7
+100,7
@@
module ApplicationHelper
else
link_name = object_for_dataclass(resource_class, link_uuid).andand.friendly_link_name
end
else
link_name = object_for_dataclass(resource_class, link_uuid).andand.friendly_link_name
end
- rescue
RuntimeError
+ rescue
ArvadosApiClient::NotFoundException
# If that lookup failed, the link will too. So don't make one.
return attrvalue
end
# If that lookup failed, the link will too. So don't make one.
return attrvalue
end
@@
-306,7
+306,7
@@
module ApplicationHelper
selectables = []
attrtext = attrvalue
selectables = []
attrtext = attrvalue
- if dataclass
and dataclass.is_a? Class
+ if dataclass
.is_a? Class and dataclass < ArvadosBase
objects = get_n_objects_of_class dataclass, 10
objects.each do |item|
items << item
objects = get_n_objects_of_class dataclass, 10
objects.each do |item|
items << item
@@
-392,7
+392,7
@@
module ApplicationHelper
render opts.merge(partial: "application/#{partial}")
end
end
render opts.merge(partial: "application/#{partial}")
end
end
-
+
def fa_icon_class_for_object object
case object.class.to_s.to_sym
when :User
def fa_icon_class_for_object object
case object.class.to_s.to_sym
when :User