remove deprecated calls

17 files changed, 20 insertions, 18 deletions

diff --git a/app/views/journey_patterns/_journey_pattern.html.erb b/app/views/journey_patterns/_journey_pattern.html.erb
index 0734a9a8b..046f87958 100644
--- a/app/views/journey_patterns/_journey_pattern.html.erb
+++ b/app/views/journey_patterns/_journey_pattern.html.erb
@@ -6,7 +6,7 @@
     <% end %><br>
     <%= t('.stop_count', :count => journey_pattern.stop_points.count, :route_count => @route.stop_points.count) %> | <%= t('.vehicle_journeys_count', :count => journey_pattern.vehicle_journeys.count) %>
     <div class="actions">  
-      <%= link_to t("actions.destroy"), referential_line_route_journey_pattern_path(@referential, @line, @route, journey_pattern), :method => :delete, :confirm =>  t('journey_patterns.actions.destroy_confirm'), :class => "remove" %>
+      <%= link_to t("actions.destroy"), referential_line_route_journey_pattern_path(@referential, @line, @route, journey_pattern), :method => :delete, :data => {:confirm =>  t('journey_patterns.actions.destroy_confirm')}, :class => "remove" %>
       <% if journey_pattern.vehicle_journeys.count > 0 %>
         | <%= link_to t('journey_patterns.journey_pattern.vehicle_journey_at_stops'), referential_line_route_vehicle_journeys_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => journey_pattern.id}), :class => "link" %>
       <% end %>
diff --git a/app/views/journey_patterns/show.html.erb b/app/views/journey_patterns/show.html.erb
index 149f9df6a..b9378abd5 100644
--- a/app/views/journey_patterns/show.html.erb
+++ b/app/views/journey_patterns/show.html.erb
@@ -53,7 +53,7 @@
 <% content_for :sidebar do %>
 <ul class="actions">
   <li><%= link_to t('journey_patterns.actions.edit'), edit_referential_line_route_journey_pattern_path(@referential, @line, @route, @journey_pattern), :class => "edit" %></li>
-  <li><%= link_to  t('journey_patterns.actions.destroy'), referential_line_route_journey_pattern_path(@referential, @line, @route, @journey_pattern), :method => :delete, :confirm =>  t('journey_patterns.actions.destroy_confirm'), :class => "remove" %></li>
+  <li><%= link_to  t('journey_patterns.actions.destroy'), referential_line_route_journey_pattern_path(@referential, @line, @route, @journey_pattern), :method => :delete, :data => {:confirm => t('journey_patterns.actions.destroy_confirm')}, :class => "remove" %></li>
   <li><%= link_to t('journey_patterns.journey_pattern.vehicle_journey_at_stops'), referential_line_route_vehicle_journeys_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => @journey_pattern.id}), :class => "link" %></li>
 </ul>
 <% end %>
diff --git a/app/views/lines/show.html.erb b/app/views/lines/show.html.erb
index ad91e1dfc..737d922a0 100644
--- a/app/views/lines/show.html.erb
+++ b/app/views/lines/show.html.erb
@@ -77,7 +77,7 @@
 <% content_for :sidebar do %>
 <ul class="actions">
   <li><%= link_to t('lines.actions.edit'), edit_referential_line_path(@referential, @line), :class => "edit" %></li>
-  <li><%= link_to  t('lines.actions.destroy'), referential_line_path(@referential, @line), :method => :delete, :confirm =>  t('lines.actions.destroy_confirm'), :class => "remove" %></li>
+  <li><%= link_to  t('lines.actions.destroy'), referential_line_path(@referential, @line), :method => :delete, :data => {:confirm =>  t('lines.actions.destroy_confirm')}, :class => "remove" %></li>
   <li><%= link_to t('routes.actions.new'), new_referential_line_route_path(@referential, @line), :class => "add" %></li> 
   <br>
 </ul>
diff --git a/app/views/networks/_network.erb b/app/views/networks/_network.erb
index f3a0b597e..9ae53650e 100644
--- a/app/views/networks/_network.erb
+++ b/app/views/networks/_network.erb
@@ -3,7 +3,7 @@
   <div class="info">
     <div class="actions">  
       <%= link_to t("actions.edit"), edit_referential_network_path(@referential, network), :class => "edit" %> |
-      <%= link_to t("actions.destroy"), referential_network_path(@referential, network), :method => :delete, :confirm =>  t('networks.actions.destroy_confirm'), :class => "remove" %>
+      <%= link_to t("actions.destroy"), referential_network_path(@referential, network), :method => :delete, :data => {:confirm =>  t('networks.actions.destroy_confirm')}, :class => "remove" %>
     </div>
   </div>
 <% end %>
diff --git a/app/views/networks/show.html.erb b/app/views/networks/show.html.erb
index 8c68f7a31..8ed9c422f 100644
--- a/app/views/networks/show.html.erb
+++ b/app/views/networks/show.html.erb
@@ -51,7 +51,7 @@
 <% content_for :sidebar do %>
 <ul class="actions">
   <li><%= link_to t('networks.actions.edit'), edit_referential_network_path(@referential, @network), :class => "edit" %></li>
-  <li><%= link_to  t('networks.actions.destroy'), referential_network_path(@referential, @network), :method => :delete, :confirm =>  t('networks.actions.destroy_confirm'), :class => "remove" %></li>
+  <li><%= link_to  t('networks.actions.destroy'), referential_network_path(@referential, @network), :method => :delete, :data => {:confirm =>  t('networks.actions.destroy_confirm')}, :class => "remove" %></li>
   <br>
 </ul>
 <% end %>
diff --git a/app/views/referentials/_clean.html.erb b/app/views/referentials/_clean.html.erb
index 87a84c17f..ff2cf1185 100644
--- a/app/views/referentials/_clean.html.erb
+++ b/app/views/referentials/_clean.html.erb
@@ -6,9 +6,10 @@
     <%= form.input :keep_stops, :as => :boolean %>
     <%= form.input :keep_companies, :as => :boolean %>
     <%= form.input :keep_networks, :as => :boolean %>
+    <%= form.input :keep_group_of_lines, :as => :boolean %>
     <% end %>
     <%= form.actions do %>
-      <%= form.action :submit, :as => :button, :label => t('clean_ups.actions.clean_up') , :button_html => {:confirm => t('clean_ups.actions.confirm') }%>
+      <%= form.action :submit, :as => :button, :label => t('clean_ups.actions.clean_up') , :button_html => {:data => {:confirm => t('clean_ups.actions.confirm') }}%>
     <% end %>
   <% end %>
   </div>
diff --git a/app/views/referentials/_referential.erb b/app/views/referentials/_referential.erb
index fff6b47fd..6039b042d 100644
--- a/app/views/referentials/_referential.erb
+++ b/app/views/referentials/_referential.erb
@@ -7,7 +7,7 @@
     <%= referential.human_attribute_name('time_tables') %>: <span class="time_tables_count"></span>
     <div class="actions">  
       <%= link_to t("actions.edit"), edit_referential_path(referential), :class => "edit" %> |
-      <%= link_to t("actions.destroy"), referential_path(referential), :method => :delete, :confirm =>  t('referentials.actions.destroy_confirm'), :class => "remove" %>
+      <%= link_to t("actions.destroy"), referential_path(referential), :method => :delete, :data => {:confirm =>  t('referentials.actions.destroy_confirm')}, :class => "remove" %>
     </div>
   </div>
 <% end %>
diff --git a/app/views/referentials/show.html.erb b/app/views/referentials/show.html.erb
index 79ea6b587..64df439a0 100644
--- a/app/views/referentials/show.html.erb
+++ b/app/views/referentials/show.html.erb
@@ -44,7 +44,7 @@
 <% content_for :sidebar do %>
   <ul class="actions">
     <li><%= link_to t('referentials.actions.edit'), edit_referential_path(@referential), :class => "edit" %></li>
-    <li><%= link_to t('referentials.actions.destroy'), referential_path(@referential), :method => :delete, :confirm =>  t('referentials.actions.destroy_confirm'), :class => "remove" %></li>
+    <li><%= link_to t('referentials.actions.destroy'), referential_path(@referential), :method => :delete, :data => {:confirm =>  t('referentials.actions.destroy_confirm')}, :class => "remove" %></li>
     <br>
   </ul>
 
diff --git a/app/views/routes/show.html.erb b/app/views/routes/show.html.erb
index b2e8457d7..414d0474a 100644
--- a/app/views/routes/show.html.erb
+++ b/app/views/routes/show.html.erb
@@ -89,7 +89,7 @@
 <% content_for :sidebar do %>
 <ul class="actions">
   <li><%= link_to t('routes.actions.edit'), edit_referential_line_route_path(@referential, @line, @route), :class => "edit" %></li>
-  <li><%= link_to t('routes.actions.destroy'), referential_line_route_path(@referential, @line, @route), :method => :delete, :confirm =>  t('routes.actions.destroy_confirm'), :class => "remove" %></li>
+  <li><%= link_to t('routes.actions.destroy'), referential_line_route_path(@referential, @line, @route), :method => :delete, :data => {:confirm =>  t('routes.actions.destroy_confirm')}, :class => "remove" %></li>
   <li>
     <%= link_to t('stop_points.actions.sort'), [@referential, @line, @route, :stop_points], :class => "edit" %>
   </li>
diff --git a/app/views/stop_areas/_stop_area.html.erb b/app/views/stop_areas/_stop_area.html.erb
index c7265ab53..4f2a1a695 100644
--- a/app/views/stop_areas/_stop_area.html.erb
+++ b/app/views/stop_areas/_stop_area.html.erb
@@ -24,7 +24,7 @@
     </p>
     <div class="actions">  
       <%= link_to t("actions.edit"), edit_referential_stop_area_path(@referential, stop_area), :class => "edit" %> |
-      <%= link_to t("actions.destroy"), referential_stop_area_path(@referential, stop_area), :method => :delete, :confirm =>  t('stop_areas.actions.destroy_confirm'), :class => "remove" %>
+      <%= link_to t("actions.destroy"), referential_stop_area_path(@referential, stop_area), :method => :delete, :data => {:confirm =>  t('stop_areas.actions.destroy_confirm')}, :class => "remove" %>
     </div>
   </div>
 <% end %>
diff --git a/app/views/stop_areas/show.html.erb b/app/views/stop_areas/show.html.erb
index fdd9f120c..17f74d905 100644
--- a/app/views/stop_areas/show.html.erb
+++ b/app/views/stop_areas/show.html.erb
@@ -163,7 +163,7 @@
 <% content_for :sidebar do %>
 <ul class="actions">
   <li><%= link_to t('stop_areas.actions.edit'), edit_referential_stop_area_path(@referential, @stop_area), :class => "edit" %></li>
-  <li><%= link_to  t('stop_areas.actions.destroy'), referential_stop_area_path(@referential, @stop_area), :method => :delete, :confirm =>  t('stop_areas.actions.destroy_confirm'), :class => "remove" %></li>
+  <li><%= link_to  t('stop_areas.actions.destroy'), referential_stop_area_path(@referential, @stop_area), :method => :delete, :data => {:confirm =>  t('stop_areas.actions.destroy_confirm')}, :class => "remove" %></li>
 </ul>
   <% if @stop_area.stop_area_type == 'itl' %>
 	<h3><%= t(".itl_managment") %></h3>
diff --git a/app/views/stop_points/_stop_point_draggable.html.erb b/app/views/stop_points/_stop_point_draggable.html.erb
index 7841b6116..eea0e065a 100644
--- a/app/views/stop_points/_stop_point_draggable.html.erb
+++ b/app/views/stop_points/_stop_point_draggable.html.erb
@@ -11,7 +11,7 @@
     <%= stop_point.stop_area.human_attribute_name('country_code') %> <%= stop_point.stop_area.country_code %>
     <div class="actions">  
       <%= link_to t("stop_points.actions.show"), referential_stop_area_path(@referential, stop_point.stop_area), :class => "link" %> |
-      <%= link_to t("actions.destroy"), referential_line_route_stop_point_path(@referential, @line, @route, stop_point), :method => :delete, :confirm =>  t('stop_points.actions.destroy_confirm'), :class => "remove" %>
+      <%= link_to t("actions.destroy"), referential_line_route_stop_point_path(@referential, @line, @route, stop_point), :method => :delete, :data => {:confirm =>  t('stop_points.actions.destroy_confirm')}, :class => "remove" %>
     </div>
   </div>
 <% end %>
diff --git a/app/views/time_tables/_time_table.erb b/app/views/time_tables/_time_table.erb
index a2b3f1ff3..0679008fc 100644
--- a/app/views/time_tables/_time_table.erb
+++ b/app/views/time_tables/_time_table.erb
@@ -1,5 +1,5 @@
 <%= div_for(time_table) do %>
-  <%= link_to ( [@referential, time_table]) do %>
+  <%= link_to([@referential, time_table]) do %>
     <div class="state-code" >
       <div class="<%= time_table_state_code(time_table) %>" >
       </div>
@@ -13,7 +13,7 @@
     <%= composition_info(time_table) %>
     <div class="actions">  
       <%= link_to t("actions.edit"), edit_referential_time_table_path(@referential, time_table), :class => "edit" %> |
-      <%= link_to t("actions.destroy"), referential_time_table_path(@referential, time_table), :method => :delete, :confirm =>  t('time_tables.actions.destroy_confirm'), :class => "remove" %>
+      <%= link_to t("actions.destroy"), referential_time_table_path(@referential, time_table), :method => :delete, :data => {:confirm =>  t('time_tables.actions.destroy_confirm')}, :class => "remove" %>
     </div>
   </div>
 <% end %>
diff --git a/app/views/time_tables/show.html.erb b/app/views/time_tables/show.html.erb
index d5034c6b2..06c31041a 100644
--- a/app/views/time_tables/show.html.erb
+++ b/app/views/time_tables/show.html.erb
@@ -113,7 +113,7 @@
 <% content_for :sidebar do %>
 <ul class="actions">
   <li><%= link_to t('time_tables.actions.edit'), edit_referential_time_table_path(@referential, @time_table), :class => "edit" %></li>
-  <li><%= link_to t('time_tables.actions.destroy'), referential_time_table_path(@referential, @time_table), :method => :delete, :confirm =>  t('time_tables.actions.destroy_confirm'), :class => "remove" %></li>
+  <li><%= link_to t('time_tables.actions.destroy'), referential_time_table_path(@referential, @time_table), :method => :delete, :data => {:confirm =>  t('time_tables.actions.destroy_confirm')}, :class => "remove" %></li>
   <br>
 </ul>
 
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 10c369bf4..07e747331 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -15,7 +15,7 @@
   <ul class="actions">
     <li><%= link_to t('users.actions.edit'), edit_organisation_user_path( @user), :class => "edit" %></li>
     <% unless current_user.id==@user.id %>
-    <li><%= link_to t('users.actions.destroy'), organisation_user_path(@user),:method => :delete, :confirm => t('users.actions.destroy_confirm'), :class => "remove" %></li>
+    <li><%= link_to t('users.actions.destroy'), organisation_user_path(@user),:method => :delete, :data => {:confirm => t('users.actions.destroy_confirm')}, :class => "remove" %></li>
     <% end %>
   </ul>
 <% end %>
diff --git a/app/views/vehicle_journeys/show.html.erb b/app/views/vehicle_journeys/show.html.erb
index 9f748d52f..3ed6452ae 100644
--- a/app/views/vehicle_journeys/show.html.erb
+++ b/app/views/vehicle_journeys/show.html.erb
@@ -91,7 +91,7 @@
   <% content_for :sidebar do %>
   <ul class="actions">
     <li><%= link_to t('vehicle_journeys.actions.edit'), edit_referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey), :class => "edit" %></li>
-    <li><%= link_to  t('vehicle_journeys.actions.destroy'), referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey), :method => :delete, :confirm =>  t('vehicle_journeys.actions.destroy_confirm'), :class => "remove" %></li>
+    <li><%= link_to  t('vehicle_journeys.actions.destroy'), referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey), :method => :delete, :data => {:confirm =>  t('vehicle_journeys.actions.destroy_confirm')}, :class => "remove" %></li>
   </ul>
   <% unless @vehicle_journey.vehicle_journey_at_stops.empty? ||
        @vehicle_journey.vehicle_journey_at_stops.any? { |vjas| vjas.departure_time.nil? } %>
diff --git a/config/routes.rb b/config/routes.rb
index 27f586261..6d16a187b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,6 @@
 ChouetteIhm::Application.routes.draw do
-  devise_for :users do
+  devise_for :users 
+  devise_scope :users do
     match "/users/sign_up" => "subscriptions#new"
   end