aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Florisson2013-07-16 17:56:04 +0200
committerMarc Florisson2013-07-16 17:56:04 +0200
commit5328b1ff5bb2e8bc43eea14126a4096f1b8be129 (patch)
tree1601af2351e4f919a795dddd7afdeae41836faba
parent32d72221cfbc3d8369e22ed30fe3e264e33f7e27 (diff)
downloadchouette-core-5328b1ff5bb2e8bc43eea14126a4096f1b8be129.tar.bz2
fix objectid references in views
-rw-r--r--app/views/api/kml/access_links/index.kml.erb4
-rw-r--r--app/views/api/kml/access_points/index.kml.erb2
-rw-r--r--app/views/api/kml/connection_links/index.kml.erb4
-rw-r--r--app/views/api/kml/journey_patterns/show.kml.erb4
-rw-r--r--app/views/api/kml/lines/show.kml.erb4
-rw-r--r--app/views/api/kml/routes/show.kml.erb2
-rw-r--r--app/views/api/kml/stop_areas/index.kml.erb2
7 files changed, 11 insertions, 11 deletions
diff --git a/app/views/api/kml/access_links/index.kml.erb b/app/views/api/kml/access_links/index.kml.erb
index 5de679beb..1a93fb99e 100644
--- a/app/views/api/kml/access_links/index.kml.erb
+++ b/app/views/api/kml/access_links/index.kml.erb
@@ -12,10 +12,10 @@
</Data>
<% end %>
<Data name="access_point_objectid">
- <value><%= h(access_link.access_point.object_id) %></value>
+ <value><%= h(access_link.access_point.objectid) %></value>
</Data>
<Data name="stop_area_objectid">
- <value><%= h(access_link.stop_area.object_id) %></value>
+ <value><%= h(access_link.stop_area.objectid) %></value>
</Data>
</ExtendedData>
<%= access_link.geometry_presenter.geometry.kml_representation.html_safe %>
diff --git a/app/views/api/kml/access_points/index.kml.erb b/app/views/api/kml/access_points/index.kml.erb
index 2a78d9a03..7686df398 100644
--- a/app/views/api/kml/access_points/index.kml.erb
+++ b/app/views/api/kml/access_points/index.kml.erb
@@ -12,7 +12,7 @@
</Data>
<% end %>
<Data name="stop_area_objectid">
- <value><%= h(access_point.stop_area.object_id) %></value>
+ <value><%= h(access_point.stop_area.objectid) %></value>
</Data>
</ExtendedData>
<%= access_point.geometry_presenter.geometry.kml_representation.html_safe %>
diff --git a/app/views/api/kml/connection_links/index.kml.erb b/app/views/api/kml/connection_links/index.kml.erb
index 8c35dcc95..b1e2e9a1f 100644
--- a/app/views/api/kml/connection_links/index.kml.erb
+++ b/app/views/api/kml/connection_links/index.kml.erb
@@ -12,10 +12,10 @@
</Data>
<% end %>
<Data name="departure_objectid">
- <value><%= h(connection_link.departure.object_id) %></value>
+ <value><%= h(connection_link.departure.objectid) %></value>
</Data>
<Data name="arrival_objectid">
- <value><%= h(connection_link.arrival.object_id) %></value>
+ <value><%= h(connection_link.arrival.objectid) %></value>
</Data>
</ExtendedData>
<%= connection_link.geometry_presenter.geometry.kml_representation.html_safe %>
diff --git a/app/views/api/kml/journey_patterns/show.kml.erb b/app/views/api/kml/journey_patterns/show.kml.erb
index cbce3627a..6c269ab0e 100644
--- a/app/views/api/kml/journey_patterns/show.kml.erb
+++ b/app/views/api/kml/journey_patterns/show.kml.erb
@@ -9,7 +9,7 @@
</Data>
<% end %>
<Data name="route_objectid">
- <value><%= h(@journey_pattern.route.object_id) %></value>
+ <value><%= h(@journey_pattern.route.objectid) %></value>
</Data>
</ExtendedData>
<% @journey_pattern.route.stop_points.each_with_index do |stop_point, index| %>
@@ -25,7 +25,7 @@
<% end %>
<% if stop_area.parent %>
<Data name="parent_objectid">
- <value><%= h(stop_area.parent.object_id) %></value>
+ <value><%= h(stop_area.parent.objectid) %></value>
</Data>
<% end %>
<Data name="stop">
diff --git a/app/views/api/kml/lines/show.kml.erb b/app/views/api/kml/lines/show.kml.erb
index b29a5b75c..0513ed665 100644
--- a/app/views/api/kml/lines/show.kml.erb
+++ b/app/views/api/kml/lines/show.kml.erb
@@ -11,10 +11,10 @@
</Data>
<% end %>
<Data name="company_objectid">
- <value><%= h(@line.company.object_id) %></value>
+ <value><%= h(@line.company.objectid) %></value>
</Data>
<Data name="network_objectid">
- <value><%= h(@line.network.object_id) %></value>
+ <value><%= h(@line.network.objectid) %></value>
</Data>
</ExtendedData>
<%= @line.geometry_presenter.geometry.kml_representation.html_safe %>
diff --git a/app/views/api/kml/routes/show.kml.erb b/app/views/api/kml/routes/show.kml.erb
index 2f7031854..f5500a6f4 100644
--- a/app/views/api/kml/routes/show.kml.erb
+++ b/app/views/api/kml/routes/show.kml.erb
@@ -10,7 +10,7 @@
</Data>
<% end %>
<Data name="line_objectid">
- <value><%= h(@route.line.object_id) %></value>
+ <value><%= h(@route.line.objectid) %></value>
</Data>
</ExtendedData>
<%= @route.geometry_presenter.geometry.kml_representation.html_safe %>
diff --git a/app/views/api/kml/stop_areas/index.kml.erb b/app/views/api/kml/stop_areas/index.kml.erb
index ed3642890..51993bed3 100644
--- a/app/views/api/kml/stop_areas/index.kml.erb
+++ b/app/views/api/kml/stop_areas/index.kml.erb
@@ -12,7 +12,7 @@
<% end %>
<% if stop_area.parent %>
<Data name="parent_objectid">
- <value><%= h(stop_area.parent.object_id) %></value>
+ <value><%= h(stop_area.parent.objectid) %></value>
</Data>
<% end %>
</ExtendedData>