4 files changed, 13 insertions, 7 deletions
diff --git a/app/controllers/concerns/metadata_controller_support.rb b/app/controllers/concerns/metadata_controller_support.rb
index db83e79ae..4dcbfe5d0 100644
--- a/app/controllers/concerns/metadata_controller_support.rb
+++ b/app/controllers/concerns/metadata_controller_support.rb
@@ -20,7 +20,7 @@ module MetadataControllerSupport
   def set_modifier_metadata
     _resource = @resources || [resource]
     _resource.flatten.each do |r|
-      r.try :set_metadata!, :modifier_username, user_for_metadata
+      r.try(:set_metadata!, :modifier_username, user_for_metadata) if r.valid?
     end
   end
 end
diff --git a/app/controllers/journey_patterns_collections_controller.rb b/app/controllers/journey_patterns_collections_controller.rb
index db92d48f3..c1a307464 100644
--- a/app/controllers/journey_patterns_collections_controller.rb
+++ b/app/controllers/journey_patterns_collections_controller.rb
@@ -25,6 +25,8 @@ class JourneyPatternsCollectionsController < ChouetteController
     @q = @q.includes(:stop_points)
     @ppage = 10
     @journey_patterns ||= @q.paginate(page: params[:page], per_page: @ppage).order(:name)
+    @custom_fields = Chouette::JourneyPattern.custom_fields_definitions(referential.workgroup)
+
     respond_to do |format|
       format.json do
         @journey_patterns = @journey_patterns.includes(stop_points: {stop_area: :stop_area_referential})
diff --git a/app/controllers/merges_controller.rb b/app/controllers/merges_controller.rb
index 1ce64ed58..663b6e750 100644
--- a/app/controllers/merges_controller.rb
+++ b/app/controllers/merges_controller.rb
@@ -1,5 +1,5 @@
 class MergesController < ChouetteController
-  # include PolicyChecker
+  include PolicyChecker
 
   defaults resource_class: Merge
   belongs_to :workbench
diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb
index 2ac8532e0..4ca2293f0 100644
--- a/app/controllers/time_tables_controller.rb
+++ b/app/controllers/time_tables_controller.rb
@@ -77,7 +77,7 @@ class TimeTablesController < ChouetteController
   end
 
   def index
-    request.format.kml? ? @per_page = nil : @per_page = 12
+    # request.format.kml? ? @per_page = nil : @per_page = 12
 
     index! do |format|
       format.html {
@@ -130,6 +130,7 @@ class TimeTablesController < ChouetteController
 
     @time_tables ||= begin
       time_tables = @q.result(:distinct => true)
+      sort_column
       if sort_column == "bounding_dates"
         time_tables = @q.result(:distinct => false).paginate(page: params[:page], per_page: 10)
         ids = time_tables.pluck(:id).uniq
@@ -186,10 +187,13 @@ class TimeTablesController < ChouetteController
   private
 
   def sort_column
-    valid_cols = referential.time_tables.column_names
-    valid_cols << "bounding_dates"
-    valid_cols << "vehicle_journeys_count"
-    valid_cols.include?(params[:sort]) ? params[:sort] : 'comment'
+    @@valid_cols ||= begin
+      valid_cols = %w(id color comment)
+      valid_cols << "bounding_dates"
+      valid_cols << "vehicle_journeys_count"
+      valid_cols
+    end
+    @@valid_cols.include?(params[:sort]) ? params[:sort] : 'comment'
   end
   def sort_direction
     %w[asc desc].include?(params[:direction]) ?  params[:direction] : 'asc'