From fea0540ec350c092e0589697bf9f3243a8080591 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Thu, 3 Oct 2013 17:59:12 +0800 Subject: [PATCH] updated json format for location and locaiton categories --- .../location/back_end/location_categories_controller.rb | 4 ++-- .../panel/location/back_end/locations_controller.rb | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/vendor/built_in_modules/location/app/controllers/panel/location/back_end/location_categories_controller.rb b/vendor/built_in_modules/location/app/controllers/panel/location/back_end/location_categories_controller.rb index aac07d222..cd39fa90a 100644 --- a/vendor/built_in_modules/location/app/controllers/panel/location/back_end/location_categories_controller.rb +++ b/vendor/built_in_modules/location/app/controllers/panel/location/back_end/location_categories_controller.rb @@ -43,10 +43,10 @@ class Panel::Location::BackEnd::LocationCategoriesController < OrbitBackendContr I18n.locale = :zh_tw name_zh_tw = category.name 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}"} + @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 - render :json => JSON.pretty_generate({location_category: @data}) + render :json => JSON.pretty_generate(@data) end end \ No newline at end of file diff --git a/vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb b/vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb index 8adaba7c3..8c3b0a860 100644 --- a/vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb +++ b/vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb @@ -75,8 +75,7 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController end def get_categorywise_locations - @category_id = params[:category_id].first - location_infos = LocationInfo.where(:location_category_id => @category_id) + location_infos = LocationInfo.where(:location_category_id => params[:category_id]) @data = Array.new location_infos.each do |location| @@ -92,6 +91,6 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController description: location.description } end - render :json => JSON.pretty_generate({location: @data}) + render :json => JSON.pretty_generate(@data) end end