another issue from the maps in maps branch

This commit is contained in:
Connor Turland 2016-10-06 09:33:10 -04:00
parent a56c4eb110
commit e72ae5df94

View file

@ -20,7 +20,7 @@ class TopicsController < ApplicationController
@topics = []
@maps = []
end
@all= @topics.concat(@maps).sort { |a, b| a.name <=> b.name }
@all= @topics.to_a.concat(@maps.to_a).sort { |a, b| a.name <=> b.name }
render json: autocomplete_array_json(@all)
end