diff options
| author | Luc Donnet | 2014-06-25 16:59:46 +0200 |
|---|---|---|
| committer | Luc Donnet | 2014-06-25 16:59:46 +0200 |
| commit | 3066074f0b38cff0d9d667d494da0d66efecf749 (patch) | |
| tree | 3f18e044d753dd6cbf6d64404aa596cef9a18c24 /app/views/stop_areas | |
| parent | 0449133dc118c1859511b23c02743bcf08dc7359 (diff) | |
| parent | b3ff1089b7495ece5be71989737cdef78ac42b54 (diff) | |
| download | chouette-core-3066074f0b38cff0d9d667d494da0d66efecf749.tar.bz2 | |
Merge branch 'master' of github.com:afimb/chouette2
Conflicts:
app/views/access_points/_form.html.erb
config/environments/production.rb
Diffstat (limited to 'app/views/stop_areas')
| -rw-r--r-- | app/views/stop_areas/_form.html.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/stop_areas/_form.html.erb b/app/views/stop_areas/_form.html.erb index c0ca1c922..74bccc816 100644 --- a/app/views/stop_areas/_form.html.erb +++ b/app/views/stop_areas/_form.html.erb @@ -35,7 +35,7 @@ <%= form.input :lift_availability,:as => :boolean %> <% end %> - <%= form.input :objectid, :required => !@stop_area.new_record?, :input_html => { :disabled => !@stop_area.new_record? } %> + <%= form.input :objectid, :required => !@stop_area.new_record? %> <% end %> <%= form.actions do %> |