From 761ad42ea0ec53a633cbb30d65acf041231e92ec Mon Sep 17 00:00:00 2001
From: Zog
Date: Mon, 22 Jan 2018 10:33:46 +0100
Subject: Fix bug on VJs index

---
 app/controllers/vehicle_journeys_controller.rb | 2 +-
 app/views/vehicle_journeys/index.html.slim     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index 93ebd4472..c1762c13e 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -205,7 +205,7 @@ class VehicleJourneysController < ChouetteController
             }
           end
         }.to_json,
-        text: "<strong>" + item.published_name + " - " + item.get_objectid.short_id + "</strong><br/><small>" + item.registration_number + "</small>"
+        text: "<strong>#{item.published_name} - #{item.get_objectid.short_id}</strong><br/><small>#{item.registration_number}</small>"
       }
     end
   end
diff --git a/app/views/vehicle_journeys/index.html.slim b/app/views/vehicle_journeys/index.html.slim
index a02d5ed38..ce56f9332 100644
--- a/app/views/vehicle_journeys/index.html.slim
+++ b/app/views/vehicle_journeys/index.html.slim
@@ -17,7 +17,7 @@
 = javascript_tag do
   | window.route_id = #{params[:route_id]};
   | window.stopPoints = #{(@stop_points_list.to_json).html_safe};
-  | window.jpOrigin = #{(@jp_origin.present? ? @jp_origin.attributes.update({full_schedule: @jp_origin.full_schedule?}).to_json  : "").html_safe};
+  | window.jpOrigin = #{(@jp_origin.present? ? @jp_origin.attributes.update({full_schedule: @jp_origin.full_schedule?}).to_json  : "null").html_safe};
   | window.jpOriginStopPoints = #{(@jp_origin_stop_points.to_json).html_safe};
   | window.transportMode = #{(@transport_mode.to_json).html_safe};
   | window.transportSubmode = #{(@transport_submode.to_json).html_safe};
-- 
cgit v1.2.3