From a692df1c4c336a971219f714bee01a156f4cf8e9 Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Wed, 26 Jul 2017 10:08:29 +0200
Subject: Fix deleted stop_points use Refs #4161 @1

---
 .../javascripts/es6_browserified/itineraries/index.js       | 13 -------------
 .../es6_browserified/itineraries/reducers/stopPoints.js     |  9 +++++++++
 2 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/es6_browserified/itineraries/index.js b/app/assets/javascripts/es6_browserified/itineraries/index.js
index a8f3048fa..2ffb84319 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/index.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/index.js
@@ -75,22 +75,9 @@ document.querySelector('input[name=commit]').addEventListener('click', (event)=>
       addInput('for_boarding',stopPoint.for_boarding, i)
       addInput('for_alighting',stopPoint.for_alighting, i)
     })
-    if(state.stopPoints.length < datas.length){
-      for(var j= state.stopPoints.length; j < datas.length; j++){
-        updateFormForDeletion(datas[j])
-      }
-    }
   } else {
     event.preventDefault()
     let msg = "L'itinéraire doit comporter au moins deux arrêts"
     $('#stop_points').find('.subform').after("<div class='alert alert-danger'><span class='fa fa-lg fa-exclamation-circle'></span><span>" + msg + "</span></div>")
   }
 })
-
-const updateFormForDeletion = (stop) =>{
-  if (stop.stoppoint_id !== undefined){
-    let now = Date.now()
-    addInput('id', stop.stoppoint_id, now)
-    addInput('_destroy', 'true', now)
-  }
-}
diff --git a/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js
index 729f2f16f..a3b8accb3 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js
@@ -20,6 +20,14 @@ const stopPoint = (state = {}, action, length) => {
   }
 }
 
+const updateFormForDeletion = (stop) =>{
+  if (stop.stoppoint_id !== undefined){
+    let now = Date.now()
+    addInput('id', stop.stoppoint_id, now)
+    addInput('_destroy', 'true', now)
+  }
+}
+
 const stopPoints = (state = [], action) => {
   switch (action.type) {
     case 'ADD_STOP':
@@ -42,6 +50,7 @@ const stopPoints = (state = [], action) => {
         ...state.slice(action.index + 2)
       ]
     case 'DELETE_STOP':
+      updateFormForDeletion(state[action.index])
       return [
         ...state.slice(0, action.index),
         ...state.slice(action.index + 1).map((stopPoint)=>{
-- 
cgit v1.2.3