developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Location and loction categories to pass ids

This commit is contained in:
saurabhbhatia 2013-10-03 17:30:05 +08:00
parent 746bcbed96
commit 44f5a98a69
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vendor/built_in_modules/location/app/controllers/panel/location/back_end/location_categories_controller.rb vendored
View File

@ -42,7 +42,8 @@ class Panel::Location::BackEnd::LocationCategoriesController < OrbitBackendContr
name_en = category.name name_en = category.name
I18n.locale = :zh_tw I18n.locale = :zh_tw
name_zh_tw = category.name name_zh_tw = category.name
@data << { name_en: name_en, name_zh_tw: name_zh_tw, category_id: category.id.to_s, location_link: "http://ntue.tp.rulingcom.com/panel/location/back_end/locations/get_categorywise_locations" } category_id = category.id.to_s
@data << { name_en: name_en, name_zh_tw: name_zh_tw, category_id: category_id, location_link: "http://ntue.tp.rulingcom.com/panel/location/back_end/locations/get_categorywise_locations?category_id[]=#{category_id}"}
end end
render :json => JSON.pretty_generate({location_category: @data}) render :json => JSON.pretty_generate({location_category: @data})

5
vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb vendored
View File

@ -75,12 +75,15 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController
end end
def get_categorywise_locations def get_categorywise_locations
location_infos = LocationInfo.where(:location_category_id => params[:category_id]) @category_id = params[:category_id].first
location_infos = LocationInfo.where(:location_category_id => @category_id)
@data = Array.new @data = Array.new
location_infos.each do |location| location_infos.each do |location|
picurl = location.file.blank? ? '' : "http://#{request.host_with_port + location.file.url}" picurl = location.file.blank? ? '' : "http://#{request.host_with_port + location.file.url}"
thumburl = location.file.blank? ? '' : "http://#{request.host_with_port + location.file.thumb.url}" thumburl = location.file.blank? ? '' : "http://#{request.host_with_port + location.file.thumb.url}"
@data << { name: location.name, @data << { name: location.name,
pic_url: picurl, pic_url: picurl,
thumb_url: thumburl, thumb_url: thumburl,