diff options
| author | Xinhui | 2017-11-22 14:34:05 +0100 | 
|---|---|---|
| committer | Xinhui | 2017-11-28 12:21:03 +0100 | 
| commit | 4792a04f83f5a52757092e5b66f6d27f658c3c6b (patch) | |
| tree | 4ec705370cf3c246ebad4ceed66106f176eae42c /app/views/api | |
| parent | 1e54a61308a8bbb9ad9d63341a4c9d817f414026 (diff) | |
| download | chouette-core-4792a04f83f5a52757092e5b66f6d27f658c3c6b.tar.bz2 | |
Refactoring move referentialSupport from chouetteController into childrens
Diffstat (limited to 'app/views/api')
| -rw-r--r-- | app/views/api/kml/access_links/index.kml.slim | 2 | ||||
| -rw-r--r-- | app/views/api/kml/access_points/index.kml.slim | 2 | ||||
| -rw-r--r-- | app/views/api/kml/connection_links/index.kml.slim | 2 | ||||
| -rw-r--r-- | app/views/api/kml/journey_patterns/show.kml.slim | 4 | ||||
| -rw-r--r-- | app/views/api/kml/lines/show.kml.slim | 2 | ||||
| -rw-r--r-- | app/views/api/kml/routes/show.kml.slim | 2 | ||||
| -rw-r--r-- | app/views/api/kml/stop_areas/index.kml.slim | 2 | ||||
| -rw-r--r-- | app/views/api/v1/compliance_check_sets/validated.rabl | 1 | ||||
| -rw-r--r-- | app/views/api/v1/group_of_lines/short_description.rabl | 2 | ||||
| -rw-r--r-- | app/views/api/v1/group_of_lines/show.rabl | 2 | ||||
| -rw-r--r-- | app/views/api/v1/trident_objects/show.rabl | 2 | 
11 files changed, 11 insertions, 12 deletions
| diff --git a/app/views/api/kml/access_links/index.kml.slim b/app/views/api/kml/access_links/index.kml.slim index 1bcfdacf1..06db8bf9d 100644 --- a/app/views/api/kml/access_links/index.kml.slim +++ b/app/views/api/kml/access_links/index.kml.slim @@ -8,7 +8,7 @@ kml xmlns="http://www.opengis.net/kml/2.2"        placemark id="#{access_link.objectid}"          name = h(access_link.name)          extendeddata -          - [ :access_link_type, :objectid, :object_version, :created_at, :updated_at, :creator_id, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs, :link_orientation].each do |prop| +          - [ :access_link_type, :objectid, :object_version, :created_at, :updated_at, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs, :link_orientation].each do |prop|              data name="#{prop.to_s}"                value = h(access_link.send( prop)) diff --git a/app/views/api/kml/access_points/index.kml.slim b/app/views/api/kml/access_points/index.kml.slim index 1a162f7ed..c6f6b7797 100644 --- a/app/views/api/kml/access_points/index.kml.slim +++ b/app/views/api/kml/access_points/index.kml.slim @@ -9,7 +9,7 @@ kml xmlns="http://www.opengis.net/kml/2.2"        placemark id="#{access_point.objectid}"          name = h(access_point.name)          extendeddata -          - [ :objectid, :object_version, :creator_id, :created_at, :updated_at, :name, :comment, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :openning_time, :closing_time, :access_type, :access_point_type, :mobility_restricted_suitability, :stairs_availability, :lift_availability].each do |prop| +          - [ :objectid, :object_version, :created_at, :updated_at, :name, :comment, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :openning_time, :closing_time, :access_type, :access_point_type, :mobility_restricted_suitability, :stairs_availability, :lift_availability].each do |prop|              data name="#{prop.to_s}"                value = h(access_point.send( prop)) diff --git a/app/views/api/kml/connection_links/index.kml.slim b/app/views/api/kml/connection_links/index.kml.slim index 7305fbc78..0acdeaafe 100644 --- a/app/views/api/kml/connection_links/index.kml.slim +++ b/app/views/api/kml/connection_links/index.kml.slim @@ -8,7 +8,7 @@ kml xmlns="http://www.opengis.net/kml/2.2"        placemark id="#{connection_link.objectid}"          name = h(connection_link.name)          extendeddata -          - [ :connection_link_type, :objectid, :object_version, :creator_id, :created_at, :updated_at, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop| +          - [ :connection_link_type, :objectid, :object_version, :created_at, :updated_at, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop|              data name="#{prop.to_s}"                value = h(connection_link.send( prop)) diff --git a/app/views/api/kml/journey_patterns/show.kml.slim b/app/views/api/kml/journey_patterns/show.kml.slim index 15fb96daa..347d358cc 100644 --- a/app/views/api/kml/journey_patterns/show.kml.slim +++ b/app/views/api/kml/journey_patterns/show.kml.slim @@ -4,7 +4,7 @@ kml xmlns="http://www.opengis.net/kml/2.2"    document      name = "#{h(Chouette::JourneyPattern.model_name.human)} : #{h(@journey_pattern.name)}"      extendeddata -      - [:objectid, :object_version, :creator_id, :created_at, :updated_at, :name, :comment, :registration_number, :published_name].each do |prop| +      - [:objectid, :object_version, :created_at, :updated_at, :name, :comment, :registration_number, :published_name].each do |prop|          data name="#{prop.to_s}"            value = h(@journey_pattern.send( prop)) @@ -17,7 +17,7 @@ kml xmlns="http://www.opengis.net/kml/2.2"          placemark id="#{stop_area.objectid}"            name = h(stop_area.name)            extendeddata -            - [ :objectid, :object_version, :creator_id, :name, :comment, :area_type, :registration_number, :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop| +            - [ :objectid, :object_version, :name, :comment, :area_type, :registration_number, :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop|                data name="#{prop.to_s}"                  value = h(stop_area.send( prop)) diff --git a/app/views/api/kml/lines/show.kml.slim b/app/views/api/kml/lines/show.kml.slim index d1e48323d..1163c98d3 100644 --- a/app/views/api/kml/lines/show.kml.slim +++ b/app/views/api/kml/lines/show.kml.slim @@ -7,7 +7,7 @@ kml xmlns="http://www.opengis.net/kml/2.2"      placemark id="#{@line.objectid}"        name = h(@line.name)        extendeddata -        - [ :transport_mode, :objectid, :created_at, :updated_at, :object_version, :creator_id, :name, :number, :published_name, :registration_number, :comment, :mobility_restricted_suitability, :int_user_needs].each do |prop| +        - [ :transport_mode, :objectid, :created_at, :updated_at, :object_version, :name, :number, :published_name, :registration_number, :comment, :mobility_restricted_suitability, :int_user_needs].each do |prop|            data name="#{prop.to_s}"              value = h(@line.send( prop)) diff --git a/app/views/api/kml/routes/show.kml.slim b/app/views/api/kml/routes/show.kml.slim index 8a2843bc0..fdf73754d 100644 --- a/app/views/api/kml/routes/show.kml.slim +++ b/app/views/api/kml/routes/show.kml.slim @@ -6,7 +6,7 @@ kml xmlns="http://www.opengis.net/kml/2.2"      placemark id="#{@route.objectid}"        name = h(@route.name)        extendeddata -        - [:direction, :wayback, :objectid, :object_version, :creator_id, :created_at, :updated_at, :name, :comment, :published_name, :number, :direction_text, :wayback_text].each do |prop| +        - [:direction, :wayback, :objectid, :object_version, :created_at, :updated_at, :name, :comment, :published_name, :number, :direction_text, :wayback_text].each do |prop|            data name="#{prop.to_s}"              value = h(@route.send( prop)) diff --git a/app/views/api/kml/stop_areas/index.kml.slim b/app/views/api/kml/stop_areas/index.kml.slim index a08dbf963..284bd3e34 100644 --- a/app/views/api/kml/stop_areas/index.kml.slim +++ b/app/views/api/kml/stop_areas/index.kml.slim @@ -8,7 +8,7 @@ kml xmlns="http://www.opengis.net/kml/2.2"        placemark id="#{stop_area.objectid}"          name =  h(stop_area.name)          extendeddata -          - [:objectid, :object_version, :creator_id, :created_at, :updated_at, :name, :comment, :area_type, :registration_number, :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop| +          - [:objectid, :object_version, :created_at, :updated_at, :name, :comment, :area_type, :registration_number, :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop|              data name="#{prop.to_s}"                value = h(stop_area.send( prop)) diff --git a/app/views/api/v1/compliance_check_sets/validated.rabl b/app/views/api/v1/compliance_check_sets/validated.rabl index 1368a8014..4dfa9e420 100644 --- a/app/views/api/v1/compliance_check_sets/validated.rabl +++ b/app/views/api/v1/compliance_check_sets/validated.rabl @@ -4,7 +4,6 @@ attributes(    :id,    :referential_id,    :name, -  :creator,    :status,    :started_at,    :ended_at diff --git a/app/views/api/v1/group_of_lines/short_description.rabl b/app/views/api/v1/group_of_lines/short_description.rabl index 770b334ec..15465874c 100644 --- a/app/views/api/v1/group_of_lines/short_description.rabl +++ b/app/views/api/v1/group_of_lines/short_description.rabl @@ -1,6 +1,6 @@  object @group_of_line  extends "api/v1/trident_objects/short_description" -[ :creator_id, :name].each do |attr| +[:name].each do |attr|    attributes attr, :unless => lambda { |m| m.send( attr).nil?}  end diff --git a/app/views/api/v1/group_of_lines/show.rabl b/app/views/api/v1/group_of_lines/show.rabl index 96e4bfc58..d02247da9 100644 --- a/app/views/api/v1/group_of_lines/show.rabl +++ b/app/views/api/v1/group_of_lines/show.rabl @@ -1,6 +1,6 @@  object @group_of_line  extends "api/v1/trident_objects/show" -[ :creator_id, :name].each do |attr| +[:name].each do |attr|    attributes attr, :unless => lambda { |m| m.send( attr).nil?}  end diff --git a/app/views/api/v1/trident_objects/show.rabl b/app/views/api/v1/trident_objects/show.rabl index e58c0a866..9722594e1 100644 --- a/app/views/api/v1/trident_objects/show.rabl +++ b/app/views/api/v1/trident_objects/show.rabl @@ -1,5 +1,5 @@  attributes :objectid => :object_id -[ :object_version, :created_at, :updated_at, :creator_id].each do |attr| +[ :object_version, :created_at, :updated_at].each do |attr|    attributes attr, :unless => lambda { |m| m.send( attr).nil?}  end | 
