13 files changed, 33 insertions, 8 deletions
diff --git a/app/assets/stylesheets/vendor/openlayers_style.css b/app/assets/stylesheets/vendor/openlayers_style.css
index 0e3a67108..25308996f 100644
--- a/app/assets/stylesheets/vendor/openlayers_style.css
+++ b/app/assets/stylesheets/vendor/openlayers_style.css
@@ -139,7 +139,7 @@ div.olControlMousePosition {
 }    
 
 .olControlNavigationHistory {
-   background-image: url( image-path('/assets/openlayers/navigation_history.png') );
+   background-image: url( image-path('openlayers/navigation_history.png') );
    background-repeat: no-repeat;
    width:  24px;
    height: 24px;
diff --git a/app/controllers/access_links_controller.rb b/app/controllers/access_links_controller.rb
index b22dd75a8..2a9189eaa 100644
--- a/app/controllers/access_links_controller.rb
+++ b/app/controllers/access_links_controller.rb
@@ -79,4 +79,8 @@ class AccessLinksController < ChouetteController
       end
   end
 
+  def permitted_params
+    params.permit(company: [ :id, :access_link_type,:access_point_id, :stop_area_id, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs, :link_orientation, :link_orientation_type, :stop_area ])
+  end
+
 end
diff --git a/app/controllers/companies_controller.rb b/app/controllers/companies_controller.rb
index 025c0fdee..90d0c2530 100644
--- a/app/controllers/companies_controller.rb
+++ b/app/controllers/companies_controller.rb
@@ -35,4 +35,8 @@ class CompaniesController < ChouetteController
     referential_companies_path(referential)
   end
 
+  def permitted_params
+    params.permit(company: [ :objectid, :object_version, :creation_time, :creator_id, :name, :short_name, :organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :registration_number, :url, :time_zone ])
+  end
+
 end
diff --git a/app/controllers/connection_links_controller.rb b/app/controllers/connection_links_controller.rb
index 9f08babf0..a8e0c19a6 100644
--- a/app/controllers/connection_links_controller.rb
+++ b/app/controllers/connection_links_controller.rb
@@ -52,4 +52,8 @@ class ConnectionLinksController < ChouetteController
     referential_connection_links_path(referential)
   end
 
+  def permitted_params
+    params.permit(connection_link: [ :connection_link_type,:departure_id, :arrival_id, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs ])
+  end
+
 end
diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb
index 18e7ee28b..907d1e63d 100644
--- a/app/controllers/journey_patterns_controller.rb
+++ b/app/controllers/journey_patterns_controller.rb
@@ -50,4 +50,8 @@ class JourneyPatternsController < ChouetteController
     @journey_patterns ||= @q.result(:distinct => true).order(:name)
   end
 
+  def permitted_params
+    params.permit(journey_pattern: [ :route_id, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :registration_number, :published_name, :departure_stop_point_id, :arrival_stop_point_id, :stop_point_ids, :stop_points ])
+  end
+
 end
diff --git a/app/controllers/networks_controller.rb b/app/controllers/networks_controller.rb
index 25c4caaac..618bb83e6 100644
--- a/app/controllers/networks_controller.rb
+++ b/app/controllers/networks_controller.rb
@@ -40,4 +40,9 @@ class NetworksController < ChouetteController
   def collection_url
     referential_networks_path(referential)
   end
+
+  def permitted_params
+    params.permit(network: [ :objectid, :object_version, :creation_time, :creator_id, :version_date, :description, :name, :registration_number, :source_name, :source_type, :source_identifier, :comment ])
+  end
+  
 end
diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb
index be1738060..be0a3c4bd 100644
--- a/app/controllers/time_tables_controller.rb
+++ b/app/controllers/time_tables_controller.rb
@@ -87,4 +87,9 @@ class TimeTablesController < ChouetteController
   def collection_url
     referential_time_tables_path(referential)
   end
+
+  def permitted_params
+    params.permit(time_table: [ :objectid, :object_version, :creation_time, :creator_id, :version, :comment,
+:int_day_types, :monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday, :start_date, :end_date, :dates_attributes, :periods_attributes, :tag_list, :tag_search ] )
+  end
 end
diff --git a/app/inputs/extended_time_picker_input.rb b/app/inputs/extended_time_picker_input.rb
index 2298c0185..71628f128 100644
--- a/app/inputs/extended_time_picker_input.rb
+++ b/app/inputs/extended_time_picker_input.rb
@@ -3,7 +3,6 @@ class ExtendedTimePickerInput < Formtastic::Inputs::TimePickerInput
   def value
     return options[:input_html][:value] if options[:input_html] && options[:input_html].key?(:value)
     val = object.send(method)
-    puts val.to_s
     return "00:00:00" if val.is_a?(Date)
     return val.strftime("%H:%M:%S") if val.is_a?(Time)
     return "00:00:00" if val.nil?
diff --git a/app/views/companies/_companies.erb b/app/views/companies/_companies.erb
index f059201e6..bfb7a0b5b 100644
--- a/app/views/companies/_companies.erb
+++ b/app/views/companies/_companies.erb
@@ -1,9 +1,9 @@
 <div class="page_info">
-  <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info(@companies) %>
+  <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info( @companies.to_a ) %>
 </div>
 <div class="companies paginated_content">
    <%= paginated_content(@companies) %>
 </div>
 <div class="pagination">
   <%= will_paginate @companies, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer %>
-</div>
+</div>
+\ No newline at end of file
diff --git a/app/views/companies/index.html.erb b/app/views/companies/index.html.erb
index c28eaa8bc..ec6ffbeb2 100644
--- a/app/views/companies/index.html.erb
+++ b/app/views/companies/index.html.erb
@@ -16,7 +16,7 @@
 </div>  
 <% end %>
 
-<div id="companies"><%= render 'companies' %></div>
+<div id="companies"><%= render partial: "companies", object: @companies %></div>
 
 <% content_for :sidebar do %>
 <ul class="actions">
diff --git a/app/views/connection_links/_connection_links.erb b/app/views/connection_links/_connection_links.erb
index cfc1d45f4..3717ecb9c 100644
--- a/app/views/connection_links/_connection_links.erb
+++ b/app/views/connection_links/_connection_links.erb
@@ -1,5 +1,5 @@
 <div class="page_info">
-  <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @connection_links %>
+  <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @connection_links.to_a %>
 </div>
 <div class="connection_links paginated_content">
   <%= paginated_content(@connection_links) %>
diff --git a/app/views/networks/_networks.erb b/app/views/networks/_networks.erb
index 9d95d63b6..65ea7d069 100644
--- a/app/views/networks/_networks.erb
+++ b/app/views/networks/_networks.erb
@@ -1,5 +1,5 @@
 <div class="page_info">
-  <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @networks %>
+  <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @networks.to_a %>
 </div>
 <div class="networks paginated_content">
   <%= paginated_content(@networks) %>
diff --git a/app/views/time_tables/_time_tables.html.erb b/app/views/time_tables/_time_tables.html.erb
index 4458f653d..ba95c1811 100644
--- a/app/views/time_tables/_time_tables.html.erb
+++ b/app/views/time_tables/_time_tables.html.erb
@@ -1,5 +1,5 @@
 <div class="page_info">
-  <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @time_tables %>
+  <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @time_tables.to_a %>
 </div>
 <div class="time_tables paginated_content">
   <%= paginated_content(@time_tables) %>