aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorAlban Peignier2018-05-17 12:38:50 +0200
committerJohan Van Ryseghem2018-05-17 16:27:32 +0200
commit85864e22795e6a2f04032234e2e39a58e900f1a5 (patch)
tree4287a7af0ccef07bbda6da008a1a6a5ea7211163 /app
parente0864d754a0467addb39ce860b659818877bb9ec (diff)
downloadchouette-core-85864e22795e6a2f04032234e2e39a58e900f1a5.tar.bz2
Test opposite routes in merge referential. Refs #6842
Diffstat (limited to 'app')
-rw-r--r--app/models/merge.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge.rb b/app/models/merge.rb
index c8018e140..aca2f4d4d 100644
--- a/app/models/merge.rb
+++ b/app/models/merge.rb
@@ -166,7 +166,7 @@ class Merge < ApplicationModel
objectid: objectid,
# line_id is the same
# all other primary must be changed
- opposite_route_id: nil #FIXME
+ opposite_route_id: nil # merged after
)
new_route = new.routes.build attributes