diff options
| author | Alban Peignier | 2012-04-16 09:03:27 +0200 |
|---|---|---|
| committer | Alban Peignier | 2012-04-16 09:03:27 +0200 |
| commit | 078b065ec2cdf3cb3907509b9daeae0ffeedf443 (patch) | |
| tree | 4fdf89d451ecd939d758478cae45420880407274 | |
| parent | bf8c2560775d15803ba4967936917d0a18deee4c (diff) | |
| parent | 210cec8f14d86b04dd85571c5d0d1db732ab0dfd (diff) | |
| download | chouette-core-078b065ec2cdf3cb3907509b9daeae0ffeedf443.tar.bz2 | |
Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | app/views/lines/_form.erb | 2 | ||||
| -rw-r--r-- | app/views/stop_areas/_form.html.erb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 340a990ad..e4e705f5e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://chouette.dryade.priv/ninoxe - revision: 3c5379299d789aa0764874e3c122c75735bf8a13 + revision: be3072bcfbceb597bc74ee7661733ea01110632a specs: ninoxe (0.0.8) GeoRuby diff --git a/app/views/lines/_form.erb b/app/views/lines/_form.erb index 60faa8f68..ed0e4f9a2 100644 --- a/app/views/lines/_form.erb +++ b/app/views/lines/_form.erb @@ -7,7 +7,7 @@ <%= form.input :published_name %> <%= form.input :registration_number %> <%= form.input :number %> - <%= form.input :transport_mode_name, :as => :select, :collection => Chouette::Line.transport_modes, :include_blank => false, :member_label => Proc.new { |mode| t("transport_modes.label.#{mode}") } %> + <%= form.input :transport_mode, :as => :select, :collection => Chouette::Line.transport_modes, :include_blank => false, :member_label => Proc.new { |mode| t("transport_modes.label.#{mode}") } %> <%= form.input :comment %> <% if @line.new_record? %> <%= form.input :objectid %> diff --git a/app/views/stop_areas/_form.html.erb b/app/views/stop_areas/_form.html.erb index dc953f5e0..33ced3c1a 100644 --- a/app/views/stop_areas/_form.html.erb +++ b/app/views/stop_areas/_form.html.erb @@ -7,7 +7,7 @@ <%= form.input :country_code %> <%= form.input :fare_code %> <%= form.input :registration_number %> - <%= form.input :area_type, :as => :select, :collection => Chouette::StopArea.types, :include_blank => false, :member_label => Proc.new { |type| t("area_types.label.#{type}") } %> + <%= form.input :type, :as => :select, :collection => Chouette::StopArea.types, :include_blank => false, :member_label => Proc.new { |type| t("area_types.label.#{type}") } %> <% if @stop_area.new_record? %> <%= form.input :objectid %> <% else %> |