Refs #5455; Optimize controllers for the Journey Patterns editor

3 files changed, 8 insertions, 4 deletions

diff --git a/app/assets/stylesheets/modules/_jp_collection.sass b/app/assets/stylesheets/modules/_jp_collection.sass
index 48f82a05a..90005ac3d 100644
--- a/app/assets/stylesheets/modules/_jp_collection.sass
+++ b/app/assets/stylesheets/modules/_jp_collection.sass
@@ -128,6 +128,7 @@
           padding: 5px
           color: white
           position: absolute
+          cursor: not-allowed
           left: 75px
           top: -1px
           transform: translateY(-50%)
@@ -171,6 +172,7 @@
               color: black
 
       .edit-mode .costs
+        cursor: pointer
         p
           margin-bottom: 5px
           & + p
diff --git a/app/controllers/journey_patterns_collections_controller.rb b/app/controllers/journey_patterns_collections_controller.rb
index 6b661da0c..4c698bb89 100644
--- a/app/controllers/journey_patterns_collections_controller.rb
+++ b/app/controllers/journey_patterns_collections_controller.rb
@@ -23,14 +23,15 @@ class JourneyPatternsCollectionsController < ChouetteController
       @q = @q.where(id: ids)
     end
     @q = @q.includes(:stop_points)
-    # @q = route.journey_patterns.search(params[:q]).result().includes(:stop_points)
     @ppage = 10
     @journey_patterns ||= @q.paginate(page: params[:page], per_page: @ppage).order(:name)
     respond_to do |format|
-      format.json
+      format.json do
+        @journey_patterns = @journey_patterns.includes(stop_points: {stop_area: :stop_area_referential})
+      end
       format.html do
         @stop_points_list = []
-        route.stop_points.each do |sp|
+        route.stop_points.includes(:stop_area).each do |sp|
           @stop_points_list << {
             :id => sp.stop_area.id,
             :route_id => sp.try(:route_id),
diff --git a/app/views/api/v1/journey_patterns/show.rabl b/app/views/api/v1/journey_patterns/show.rabl
index 67d483147..815b1cf0b 100644
--- a/app/views/api/v1/journey_patterns/show.rabl
+++ b/app/views/api/v1/journey_patterns/show.rabl
@@ -14,11 +14,12 @@ node(:route_short_description) do |journey_pattern|
 end
 
 node(:vehicle_journey_object_ids) do |journey_pattern|
-  journey_pattern.vehicle_journeys.map(&:objectid)
+  journey_pattern.vehicle_journeys.pluck(:objectid)
 end unless root_object.vehicle_journeys.empty?
 
 child :stop_points => :stop_area_short_descriptions do |stop_points|
   node do |stop_point|
+    cache stop_point.stop_area_id
     partial("api/v1/stop_areas/short_description", :object => stop_point.stop_area)
   end
 end