From d444becaf731d75dfd025f393aaec9d3ba629e7e Mon Sep 17 00:00:00 2001 From: Thomas Haddad Date: Wed, 17 May 2017 12:34:51 +0200 Subject: Refs #870: Fix keep id when shifting vjas Signed-off-by: Thomas Shawarma Haddad Signed-off-by: Teddy Wing --- .../vehicle_journeys/reducers/vehicleJourneys.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js index d9f99e644..d153739ce 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js @@ -1,7 +1,7 @@ var _ = require('lodash') var actions = require("../actions") -const vehicleJourney= (state = {}, action) => { +const vehicleJourney= (state = {}, action, keep) => { switch (action.type) { case 'SELECT_VEHICLEJOURNEY': return _.assign({}, state, {selected: !state.selected}) @@ -61,10 +61,14 @@ const vehicleJourney= (state = {}, action) => { actions.checkSchedules(shiftedSchedule) shiftedVjas = _.assign({}, state.vehicle_journey_at_stops[i], shiftedSchedule) vjas = _.assign({}, state.vehicle_journey_at_stops[i], shiftedVjas) - delete vjas['id'] + if(!keep){ + delete vjas['id'] + } return vjas }else { - delete vjas['id'] + if(!keep){ + delete vjas['id'] + } return vjas } }) @@ -165,7 +169,7 @@ const vehicleJourneys = (state = [], action) => { case 'SHIFT_VEHICLEJOURNEY': return state.map((vj, i) => { if (vj.selected){ - return vehicleJourney(vj, action) + return vehicleJourney(vj, action, true) }else{ return vj } @@ -180,7 +184,7 @@ const vehicleJourneys = (state = [], action) => { selectedIndex = i for (i = 0; i< action.data.duplicate_number.value; i++){ action.data.additional_time.value = val * (i + 1) - dupeVj = vehicleJourney(vj, action) + dupeVj = vehicleJourney(vj, action, false) dupeVj.published_journey_name = dupeVj.published_journey_name + '-' + i dupeVj.selected = false delete dupeVj['objectid'] -- cgit v1.2.3