diff options
| author | Zog | 2018-04-25 18:40:25 +0200 |
|---|---|---|
| committer | Zog | 2018-04-25 18:40:25 +0200 |
| commit | 6c61ffc242a562aeac83317c756e09d8ad210815 (patch) | |
| tree | 4beac3f794b3b42f60517647fb157c706dce2b4b /app/models/merge.rb | |
| parent | 53990515457b7618e9b2b36832751ad8622fd56e (diff) | |
| download | chouette-core-6c61ffc242a562aeac83317c756e09d8ad210815.tar.bz2 | |
Refs #6762; Fix bug on RoutingConstraintsZone merge
And add some specs
Diffstat (limited to 'app/models/merge.rb')
| -rw-r--r-- | app/models/merge.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge.rb b/app/models/merge.rb index eadeccaa7..69749d105 100644 --- a/app/models/merge.rb +++ b/app/models/merge.rb @@ -212,7 +212,7 @@ class Merge < ApplicationModel end new_route.routing_constraint_zones.each do |new_routing_constraint_zone| - routing_constraint_zone = routing_constraint_zones.find { |c| c.checksum = new_routing_constraint_zone.checksum } + routing_constraint_zone = routing_constraint_zones.find { |c| c.checksum == new_routing_constraint_zone.checksum } if routing_constraint_zone referential_routing_constraint_zones_new_ids[routing_constraint_zone.id] = new_routing_constraint_zone.id else |