Merge branch 'develop' into feature/https-preparation

This commit is contained in:
Devin Howard 2015-12-20 22:24:47 +08:00
commit c79a5f0072
2 changed files with 1 additions and 9 deletions

View file

@ -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'] = t.metacode.asset_path_icon
topic['typeImageURL'] = t.metacode.icon
topic['permission'] = t.permission
topic['mapCount'] = t.maps.count
topic['synapseCount'] = t.synapses.count

View file

@ -14,14 +14,6 @@ class Metacode < ActiveRecord::Base
return false
end
def 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))