Fix tests and merge master

1 files changed, 7 insertions, 6 deletions

diff --git a/app/controllers/access_links_controller.rb b/app/controllers/access_links_controller.rb
index 2a9189eaa..36063ced5 100644
--- a/app/controllers/access_links_controller.rb
+++ b/app/controllers/access_links_controller.rb
@@ -61,14 +61,12 @@ class AccessLinksController < ChouetteController
       build_breadcrumb :edit
     end
   end
+
+  
   protected
   
   alias_method :access_link, :resource
 
-#  def map
-#    @map = AccessLinkMap.new(access_link).with_helpers(self)
-#  end
-
   def collection
     @q = parent.access_links.search(params[:q])
     @access_links ||= 
@@ -78,9 +76,12 @@ class AccessLinksController < ChouetteController
         access_links
       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 ])
+  private
+  
+  def access_link_params
+    params.require(:access_link).permit( :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