aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZog2018-01-22 10:33:46 +0100
committerZog2018-01-22 10:34:10 +0100
commit761ad42ea0ec53a633cbb30d65acf041231e92ec (patch)
tree42474ee403c7d4b7c291a66333ab2125b2c279b3
parent13f1ea15f0e20effd3f7b5afe018d8d346579c2e (diff)
downloadchouette-core-761ad42ea0ec53a633cbb30d65acf041231e92ec.tar.bz2
Fix bug on VJs index
-rw-r--r--app/controllers/vehicle_journeys_controller.rb2
-rw-r--r--app/views/vehicle_journeys/index.html.slim2
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};