add registration_number in stop area auto complete. Mantis 30118

2 files changed, 12 insertions, 28 deletions

diff --git a/app/controllers/stop_area_children_controller.rb b/app/controllers/stop_area_children_controller.rb
index f115ff35a..773f6e1b8 100644
--- a/app/controllers/stop_area_children_controller.rb
+++ b/app/controllers/stop_area_children_controller.rb
@@ -3,27 +3,19 @@ class StopAreaChildrenController < ChouetteController
   respond_to :json, :only => :index
 
   def index
-    respond_to do |format|  
-      format.json { render :json => children_maps }  
-    end  
+    respond_to do |format|
+      format.json { render :json => children_maps }
+    end
   end
 
   protected
 
   def children_maps
-    children.collect do |area|
-      { :id => area.id.to_s, 
-        :name => area.name,
-        :country_code =>  area.country_code,
-        :zip_code => area.zip_code || "",
-        :city_name => area.city_name || "",
-        :area_type => t("area_types.label.#{area.area_type.underscore}")
-      }
-    end
+    children.map { |c| c.attributes}
   end
 
-  def children 
-    referential.stop_areas.find(params[:stop_area_id]).possible_children.select{ |p| p.name =~ /#{params[:q]}/i  }       
+  def children
+    referential.stop_areas.find(params[:stop_area_id]).possible_children.select{ |p| p.name =~ /#{params[:q]}/i  }
   end
 
 end
diff --git a/app/controllers/stop_area_parents_controller.rb b/app/controllers/stop_area_parents_controller.rb
index 1dbb0796c..06b462075 100644
--- a/app/controllers/stop_area_parents_controller.rb
+++ b/app/controllers/stop_area_parents_controller.rb
@@ -3,25 +3,17 @@ class StopAreaParentsController < ChouetteController
   respond_to :json, :only => :index
 
   def index
-    respond_to do |format|  
-      format.json { render :json => parents_maps }  
-    end  
+    respond_to do |format|
+      format.json { render :json => parents_maps }
+    end
   end
 
   def parents_maps
-    parents.collect do |area|
-      { :id => area.id.to_s, 
-        :name => area.name,
-        :country_code =>  area.country_code,
-        :zip_code => area.zip_code || "",
-        :city_name => area.city_name || "",
-        :area_type => t("area_types.label.#{area.area_type.underscore}")
-      }
-    end
+    parents.map { |p| p.attributes}
   end
 
-  def parents 
-    referential.stop_areas.find(params[:stop_area_id]).possible_parents.select{ |p| p.name =~ /#{params[:q]}/i  }       
+  def parents
+    referential.stop_areas.find(params[:stop_area_id]).possible_parents.select{ |p| p.name =~ /#{params[:q]}/i  }
   end
 
 end