From ee62d6fca453bf7fb1a32274a1e48f888caaf04b Mon Sep 17 00:00:00 2001
From: Paul Chavard <git@paul.chavard.net>
Date: Tue, 5 Nov 2019 17:06:49 +0100
Subject: [PATCH] Fix move type de champs

---
 app/models/procedure.rb | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/models/procedure.rb b/app/models/procedure.rb
index 6a6d3ecd6..96a427dbb 100644
--- a/app/models/procedure.rb
+++ b/app/models/procedure.rb
@@ -595,14 +595,18 @@ class Procedure < ApplicationRecord
 
   def move_type_de_champ_attributes(types_de_champ, type_de_champ, new_index)
     old_index = types_de_champ.index(type_de_champ)
-    types_de_champ.insert(new_index, types_de_champ.delete_at(old_index))
-      .map.with_index do |type_de_champ, index|
-        {
-          id: type_de_champ.id,
-          libelle: type_de_champ.libelle,
-          order_place: index
-        }
-      end
+    if types_de_champ.delete_at(old_index)
+      types_de_champ.insert(new_index, type_de_champ)
+        .map.with_index do |type_de_champ, index|
+          {
+            id: type_de_champ.id,
+            libelle: type_de_champ.libelle,
+            order_place: index
+          }
+        end
+    else
+      []
+    end
   end
 
   def before_publish