diff options
| author | Michel Etienne | 2014-06-24 16:41:49 +0200 |
|---|---|---|
| committer | Michel Etienne | 2014-06-24 16:41:49 +0200 |
| commit | 7909f7db83dbdeee280a7010bdf0a90d2b7e7e95 (patch) | |
| tree | 58be95372f7f7d77643af8e14dc0ce65d604cd0d /app/views/lines | |
| parent | 3d046b1a470712836a2bfe15f0be46cd8cc5c73b (diff) | |
| parent | e511535bcca2e090899db2f697c1d9ceac8c4c9b (diff) | |
| download | chouette-core-7909f7db83dbdeee280a7010bdf0a90d2b7e7e95.tar.bz2 | |
merge V2_4
Diffstat (limited to 'app/views/lines')
| -rw-r--r-- | app/views/lines/_form.erb | 2 | ||||
| -rw-r--r-- | app/views/lines/index.html.erb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/views/lines/_form.erb b/app/views/lines/_form.erb index 5705d7b1e..c844fbab4 100644 --- a/app/views/lines/_form.erb +++ b/app/views/lines/_form.erb @@ -9,7 +9,7 @@ <%= form.input :number %> <%= 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 %> - <%= form.input :objectid, :required => !@line.new_record?, :input_html => { :disabled => !@line.new_record? } %> + <%= form.input :objectid, :required => !@line.new_record? %> <% end %> <%= form.inputs do %> diff --git a/app/views/lines/index.html.erb b/app/views/lines/index.html.erb index 5a910d6e2..3014827af 100644 --- a/app/views/lines/index.html.erb +++ b/app/views/lines/index.html.erb @@ -86,8 +86,7 @@ <a class="disable" href="#"><%= t(".multi_selection_disable") %></a> <ul class="actions"> - <%= link_to t(".delete_selected"), referential_lines_path(@referential), "data-multiple-method" => "delete", :class => "remove" %> - <li><a href="#" class="export"><%= t(".export_selected") %></a></li> + <li><%= link_to t(".delete_selected"), referential_lines_path(@referential), "data-multiple-method" => "delete", :class => "remove" %></li> </ul> <a class="select_all" href="#"><%= t(".select_all") %></a> | <a class="deselect_all" href="#"><%= t(".deselect_all") %></a> |