aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorAlban Peignier2018-05-17 12:38:50 +0200
committerAlban Peignier2018-05-17 12:39:34 +0200
commit8b24ba0758eba49658944999da2a1a47cfd418f3 (patch)
tree48f9fbec7600282712acfd8a83a8aebda1d530db /app/models
parent4f8f01f0514ea95795aff1e0ed65537266d0a11d (diff)
downloadchouette-core-6842-merge-opposite-routes.tar.bz2
Test opposite routes in merge referential. Refs #68426842-merge-opposite-routes
Diffstat (limited to 'app/models')
-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