merge V2_4

20 files changed, 27 insertions, 27 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bb3b9afe..0876062a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Version 2.5.0 (en développement)
+# Version 2.4.1 (en développement)
 * Corrections d'anomalies
   * L'export GTFS exige que l'indice de ligne soit renseigné (Mantis 26726)
   * L'import GTFS ne tient pas compte des courses commençant après minuit (Mantis 25824)
diff --git a/Gemfile b/Gemfile
index 207672326..300dd0360 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,6 +62,7 @@ gem 'ransack'
 gem 'squeel'
 gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git'
 #gem 'ninoxe',:path => '~/projects/ninoxe'
+#gem 'ninoxe',:path => '~/workspace/chouette/ninoxe'
 #gem 'ninoxe', '~> 1.0.1'
 
 gem 'acts_as_list', '0.1.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index 21da94f80..a8df89521 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/afimb/ninoxe.git
-  revision: 81104810ace190584d6b445de0d0948bc204b7b5
+  revision: a0605b6d5430cf8e870f944ac2a34163a69a8e87
   specs:
     ninoxe (1.0.1)
-      activerecord (>= 3.1.3)
+      activerecord (>= 3.1.3, < 4.0)
       acts_as_list (~> 0.1.6)
       foreigner (= 1.6.0)
       georuby-ext (= 0.0.5)
@@ -123,9 +123,9 @@ GEM
       factory_girl (~> 2.6.0)
       railties (>= 3.0.0)
     fastercsv (1.5.5)
-    ffi (1.0.11)
-    ffi (1.0.11-java)
-    ffi-geos (0.4.0)
+    ffi (1.9.3)
+    ffi (1.9.3-java)
+    ffi-geos (1.0.0)
       ffi (>= 1.0.0)
     font-awesome-sass (4.1.0)
       sass (~> 3.2)
diff --git a/README.md b/README.md
index 59bde48c2..1637d5bd0 100644
--- a/README.md
+++ b/README.md
@@ -63,9 +63,9 @@ Assume Linux user is myuser and its group mygroup (that user is the one who star
 sudo mkdir -p /usr/local/opt/chouette-command/
 sudo chown -R myuser:mygroup /usr/local/opt/chouette-command/
 cd /usr/local/opt/chouette-command/
-wget http://maven.chouette.cityway.fr/fr/certu/chouette/chouette-gui-command/2.4.0/chouette-gui-command-2.4.0.zip
-unzip chouette-gui-command-2.4.0.zip
-cd chouette-cmd_2.4.0
+wget http://maven.chouette.cityway.fr/fr/certu/chouette/chouette-gui-command/2.4.1/chouette-gui-command-2.4.1.zip
+unzip chouette-gui-command-2.4.1.zip
+cd chouette-cmd_2.4.1
 sudo chmod a+w .
 ```
 
diff --git a/app/views/access_links/_form.html.erb b/app/views/access_links/_form.html.erb
index 147686930..a5145adc7 100644
--- a/app/views/access_links/_form.html.erb
+++ b/app/views/access_links/_form.html.erb
@@ -28,7 +28,7 @@
     <%= form.input :mobility_restricted_suitability,:as => :boolean %>
     <%= form.input :stairs_availability,:as => :boolean %>
     <%= form.input :lift_availability,:as => :boolean %>
-    <%= form.input :objectid, :required => !@access_link.new_record?, :input_html => { :disabled => !@access_link.new_record? } %>  
+    <%= form.input :objectid, :required => !@access_link.new_record? %>  
    <% end %>
    <%= form.actions do %>
      <%= form.action :submit, :as => :button %>
diff --git a/app/views/access_points/_form.html.erb b/app/views/access_points/_form.html.erb
index 8e546a878..0c5b2c37a 100644
--- a/app/views/access_points/_form.html.erb
+++ b/app/views/access_points/_form.html.erb
@@ -22,7 +22,7 @@
     <%= form.input :mobility_restricted_suitability,:as => :boolean %>
     <%= form.input :stairs_availability,:as => :boolean %>
     <%= form.input :lift_availability,:as => :boolean %>
-    <%= form.input :objectid, :required => !@access_point.new_record?, :input_html => { :disabled => !@access_point.new_record? } %>  
+    <%= form.input :objectid, :required => !@access_point.new_record? %>  
     <%= form.inputs :name => t('access_points.show.geographic_data') do %> 
       <% if ! @referential.projection_type_label.empty? %>
         <%= form.inputs :name => @referential.projection_type_label do %> 
diff --git a/app/views/companies/_form.erb b/app/views/companies/_form.erb
index 9b605a6a2..c4fb90ee1 100644
--- a/app/views/companies/_form.erb
+++ b/app/views/companies/_form.erb
@@ -9,7 +9,7 @@
     <%= form.input :fax, :as => :phone %>
     <%= form.input :email, :as => :email %>              
     <%= form.input :registration_number %>
-    <%= form.input :objectid, :required => !@company.new_record?, :input_html => { :disabled => !@company.new_record? } %>  
+    <%= form.input :objectid, :required => !@company.new_record? %>  
   <% end %>
 
    <%= form.actions do %>
diff --git a/app/views/connection_links/_form.erb b/app/views/connection_links/_form.erb
index 72d3b2046..6fc51e3cd 100644
--- a/app/views/connection_links/_form.erb
+++ b/app/views/connection_links/_form.erb
@@ -9,7 +9,7 @@
     <%= form.input :stairs_availability,:as => :boolean %>
     <%= form.input :lift_availability,:as => :boolean %>
 
-    <%= form.input :objectid, :required => !@connection_link.new_record?, :input_html => { :disabled => !@connection_link.new_record? } %>
+    <%= form.input :objectid, :required => !@connection_link.new_record? %>  
   <% end %>
   <%= form.inputs :name => t('connection_links.show.durations') do %> 
     <%= form.input :default_duration, :as => :time_picker, :ignore_date=>true,:include_seconds=>true, :label => @connection_link.human_attribute_name("default_duration"), :input_html => { :placeholder => "HH:MM" } %>       
diff --git a/app/views/group_of_lines/_form.erb b/app/views/group_of_lines/_form.erb
index 329d3c619..b92fa1ea1 100644
--- a/app/views/group_of_lines/_form.erb
+++ b/app/views/group_of_lines/_form.erb
@@ -2,7 +2,7 @@
   <%= form.inputs do %>
     <%= form.input :name %>
     <%= form.input :comment %>
-    <%= form.input :objectid, :required => !@group_of_line.new_record?, :input_html => { :disabled => !@group_of_line.new_record? } %>
+    <%= form.input :objectid, :required => !@group_of_line.new_record? %>
   <% end %>
 
   <%= form.inputs do %>
diff --git a/app/views/help/index.textile b/app/views/help/index.textile
index 709babf44..8907abe4d 100644
--- a/app/views/help/index.textile
+++ b/app/views/help/index.textile
@@ -3,7 +3,7 @@ layout: default
 title: Chouette v2 
 ---
 
-Version 2.5.0
+Version 2.4.1
 
 h3. Logiciel libre propriété de :
 
@@ -24,7 +24,7 @@ A cet égard  l'attention de l'utilisateur est attirée sur les risques associé
 
 h3. Notes de version
 
-h4. Version 2.5.0
+h4. Version 2.4.1
 
 * Corrections des anomalies suivantes :
 ** L'export GTFS exige que l'indice de ligne soit renseigné (Mantis 26726)
diff --git a/app/views/journey_patterns/_form.html.erb b/app/views/journey_patterns/_form.html.erb
index 9577edd2c..771283885 100644
--- a/app/views/journey_patterns/_form.html.erb
+++ b/app/views/journey_patterns/_form.html.erb
@@ -5,7 +5,7 @@
     <%= form.input :registration_number %>              
     <%= form.input :comment %>              
     <%= form.input :stop_point_ids, :label => stop_point_ids_label(@journey_pattern), :as => :check_boxes, :collection => @route.stop_points.map { |s| [s.stop_area.name, s.id.to_s]}, :input_html => (@journey_pattern.new_record? ? { :checked => 'checked' }:{}) %>              
-    <%= form.input :objectid, :required => !@journey_pattern.new_record?, :input_html => { :disabled => !@journey_pattern.new_record? } %>  
+    <%= form.input :objectid, :required => !@journey_pattern.new_record? %>  
   <% end %>
 
    <%= form.actions do %>
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>
diff --git a/app/views/networks/_form.erb b/app/views/networks/_form.erb
index 935a61efc..61b52a6a4 100644
--- a/app/views/networks/_form.erb
+++ b/app/views/networks/_form.erb
@@ -7,7 +7,7 @@
     <%= form.input :description %>              
     <%= form.input :source_name %>              
     <%= form.input :source_identifier %>              
-    <%= form.input :objectid, :required => !@network.new_record?, :input_html => { :disabled => !@network.new_record? } %>  
+    <%= form.input :objectid, :required => !@network.new_record? %>  
   <% end %>
 
    <%= form.actions do %>
diff --git a/app/views/routes/_form.html.erb b/app/views/routes/_form.html.erb
index b11e94f2c..508593d07 100644
--- a/app/views/routes/_form.html.erb
+++ b/app/views/routes/_form.html.erb
@@ -7,7 +7,7 @@
     <%= form.input :opposite_route, :as => :select, :collection => @line.routes.select { |r| r.id != @route.id } %>
     <%= form.input :direction_code, :as => :select, :collection => Chouette::Route.directions, :include_blank => false, :member_label => Proc.new { |mode| t("directions.label.#{mode}") } %>
     <%= form.input :wayback_code, :as => :select, :collection => Chouette::Route.waybacks, :include_blank => false, :member_label => Proc.new { |mode| t("waybacks.label.#{mode}") } %>
-    <%= form.input :objectid, :required => !@route.new_record?, :input_html => { :disabled => !@route.new_record? } %>
+    <%= form.input :objectid, :required => !@route.new_record?%>
   <% end %>
 	<div id="stop_points">
 		<%= form.semantic_fields_for :stop_points, :include_id => false, :label => "TOTO" do |p| %>
diff --git a/app/views/stop_areas/_form.html.erb b/app/views/stop_areas/_form.html.erb
index 24800159a..4dda5337e 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 %>
diff --git a/app/views/time_tables/_form.erb b/app/views/time_tables/_form.erb
index 9970577d6..ddcd5742f 100644
--- a/app/views/time_tables/_form.erb
+++ b/app/views/time_tables/_form.erb
@@ -14,7 +14,7 @@
     <%= form.input :sunday, :as => :boolean %> 
   <% end %>
   <%= form.inputs do %> 
-    <%= form.input :objectid, :required => !@time_table.new_record?, :input_html => { :disabled => !@time_table.new_record? } %>  
+    <%= form.input :objectid, :required => !@time_table.new_record? %>  
   <% end %>
   
   <h3 class="time_table_periods">
diff --git a/app/views/vehicle_journeys/_form.html.erb b/app/views/vehicle_journeys/_form.html.erb
index 8f15b6336..600c96313 100644
--- a/app/views/vehicle_journeys/_form.html.erb
+++ b/app/views/vehicle_journeys/_form.html.erb
@@ -8,7 +8,7 @@
     <%= form.input :status_value %>
     <%= form.input :facility %>
     <%= form.input :vehicle_type_identifier%>
-    <%= form.input :objectid, :required => !@vehicle_journey.new_record?, :input_html => { :disabled => !@vehicle_journey.new_record? } %>
+    <%= form.input :objectid, :required => !@vehicle_journey.new_record? %>
 
 	    <%= form.inputs :class => "stop_times", :name => @vehicle_journey.human_attribute_name(:vehicle_journey_at_stop_ids) do %>
 	      <table border="0" class="vehicle_journey_at_stops">
diff --git a/config/environment.rb b/config/environment.rb
index 5353fe344..299eb7b07 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -6,4 +6,4 @@ require File.expand_path('../application', __FILE__)
 ChouetteIhm::Application.initialize!
 
 # Fix version
-APP_VERSION = '2.4.0'
+APP_VERSION = '2.4.1'
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 8f4d09b1c..68002de35 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -111,7 +111,7 @@ ChouetteIhm::Application.configure do
   # paths for external resources
   config.to_prepare do
     Devise::Mailer.layout "mailer"
-    Chouette::Command.command = ENV['CHOUETTE_GUI_COMMAND'].nil? "/usr/local/opt/chouette-command/chouette-cmd_2.4.0/chouette" ; ENV['CHOUETTE_GUI_COMMAND']
+    Chouette::Command.command = ENV['CHOUETTE_GUI_COMMAND'].nil? ? "/usr/local/opt/chouette-command/chouette-cmd_2.4.1/chouette" : ENV['CHOUETTE_GUI_COMMAND']
     ImportTask.root = "/var/lib/chouette/imports"
     Export.root = "/var/lib/chouette/exports"
   end