metacode asset_path calls
This commit is contained in:
parent
9916975e2e
commit
5ce460e967
2 changed files with 7 additions and 5 deletions
|
@ -10,7 +10,7 @@ module TopicsHelper
|
|||
topic['value'] = t.name
|
||||
topic['description'] = t.desc.truncate(70) # make this return matched results
|
||||
topic['type'] = t.metacode.name
|
||||
topic['typeImageURL'] = asset_path(t.metacode.icon)
|
||||
topic['typeImageURL'] = t.metacode.asset_path_icon
|
||||
topic['permission'] = t.permission
|
||||
topic['mapCount'] = t.maps.count
|
||||
topic['synapseCount'] = t.synapses.count
|
||||
|
|
|
@ -15,15 +15,17 @@ class Metacode < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def asset_path_icon
|
||||
ActionController::Base.helpers.asset_path icon
|
||||
if icon.start_with?('http')
|
||||
icon
|
||||
else
|
||||
ActionController::Base.helpers.asset_path icon
|
||||
end
|
||||
end
|
||||
|
||||
#output json with asset_paths merged in
|
||||
def as_json(options)
|
||||
json = super(options.merge!(methods: :asset_path_icon))
|
||||
unless json["icon"].start_with?('http')
|
||||
json["icon"] = json["asset_path_icon"]
|
||||
end
|
||||
json["icon"] = json["asset_path_icon"]
|
||||
json.except("asset_path_icon")
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue