Merge branch 'master' of github.com:dryade/chouette2

3 files changed, 25 insertions, 7 deletions

diff --git a/app/views/api/v1/access_links/show.rabl b/app/views/api/v1/access_links/show.rabl
index 5dbbec81b..adfd99d6d 100644
--- a/app/views/api/v1/access_links/show.rabl
+++ b/app/views/api/v1/access_links/show.rabl
@@ -1,6 +1,18 @@
 object @access_link
 extends "api/v1/trident_objects/show"
 
-[:access_point_id , :comment , :creation_time , :creator_id , :default_duration , :frequent_traveller_duration , :int_user_needs , :lift_availability , :link_distance , :link_orientation , :link_type , :mobility_restricted_suitability , :mobility_restricted_traveller_duration , :name ,  :occasional_traveller_duration , :stairs_availability , :stop_area_id].each do |attr|
+[ :name].each do |attr|
+  attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+end
+
+node :access_point_short_description do |connection|
+    partial( "api/v1/access_points/short_description", :object => connection.access_point) unless connection.access_point.nil?
+end
+
+node :stop_area_short_description do |connection|
+    partial( "api/v1/stop_areas/short_description", :object => connection.stop_area) unless connection.stop_area.nil?
+end
+
+[ :link_distance, :link_type, :link_orientation, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability , :stairs_availability , :lift_availability, :comment].each do |attr|
   attributes attr, :unless => lambda { |m| m.send( attr).nil?}
 end
diff --git a/app/views/api/v1/access_points/short_description.rabl b/app/views/api/v1/access_points/short_description.rabl
index e1786a51d..18e41298f 100644
--- a/app/views/api/v1/access_points/short_description.rabl
+++ b/app/views/api/v1/access_points/short_description.rabl
@@ -1,6 +1,9 @@
 object @access_point
 extends "api/v1/trident_objects/short_description"
 
-[ :name, :short_name, :registration_number].each do |attr|
-  attributes attr, :unless => lambda { |m| m.send( attr).nil?}
+[ :name, :access_type, :longitude, :latitude, :long_lat_type].each do |attr|
+    attributes attr, :unless => lambda { |m| m.send( attr).nil?}
 end
+node :contained_in_short_description do |access_point|
+  partial("api/v1/stop_areas/short_description", :object => access_point.stop_area)
+end unless root_object.stop_area.nil?
diff --git a/app/views/api/v1/access_points/show.rabl b/app/views/api/v1/access_points/show.rabl
index 76e43a9e5..07daffb44 100644
--- a/app/views/api/v1/access_points/show.rabl
+++ b/app/views/api/v1/access_points/show.rabl
@@ -1,9 +1,12 @@
 object @access_point
 extends "api/v1/trident_objects/show"
 
-[ :name, :comment, :longitude, :latitude, :long_lat_type, 
-    :x , :y , :projection_type, :country_code, :street_name, :contained_in, 
-    :openning_time, :closing_time, :access_type, :lift_availability,
-    :mobility_restricted_suitability, :stairs_availability, :stop_area_id].each do |attr|
+[ :longitude, :latitude, :long_lat_type, :street_name, :country_code, 
+    :x , :y , :projection_type, :name, :access_type, 
+    :openning_time, :closing_time, 
+    :mobility_restricted_suitability, :stairs_availability, :lift_availability, :comment].each do |attr|
   attributes attr, :unless => lambda { |m| m.send( attr).nil?}
 end
+node :contained_in_short_description do |access_point|
+  partial("api/v1/stop_areas/short_description", :object => access_point.stop_area)
+end unless root_object.stop_area.nil?