aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZog2018-01-03 18:33:31 +0100
committerZog2018-01-08 08:18:57 +0100
commitbd0ccefe3b876bc9513966b20d3afa01631a72e1 (patch)
treee2cab58a758ce9d1b2060f629705504aef39c6b9
parent4b4ec65557606b8fa7617db9397cd663edcbab78 (diff)
downloadchouette-core-bd0ccefe3b876bc9513966b20d3afa01631a72e1.tar.bz2
Refs #5455; Fix JourneyPattern editor
-rw-r--r--app/javascript/journey_patterns/actions/index.js1
-rw-r--r--config/environments/development.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/journey_patterns/actions/index.js b/app/javascript/journey_patterns/actions/index.js
index 09e2001c1..9f1c1c8d3 100644
--- a/app/javascript/journey_patterns/actions/index.js
+++ b/app/javascript/journey_patterns/actions/index.js
@@ -214,6 +214,7 @@ const actions = {
journeyPatterns.push(
_.assign({}, val, {
stop_points: val.route_short_description.stop_points,
+ costs: val.costs || {},
deletable: false
})
)
diff --git a/config/environments/development.rb b/config/environments/development.rb
index b14ce60fa..24a4ed6b8 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -94,5 +94,5 @@ Rails.application.configure do
config.i18n.available_locales = [:fr, :en]
- config.middleware.insert_after(ActionDispatch::Static, Rack::LiveReload)
+ config.middleware.insert_after(ActionDispatch::Static, Rack::LiveReload) if ENV['LIVERELOAD']
end