X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/73426ea3838a2f92f5b766b51e017d529c456471..09f6b8348607e709729d9e3c8d2678a668ab50bb:/app/models/relation.rb diff --git a/app/models/relation.rb b/app/models/relation.rb index 0adf1012d..c87f70dad 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -27,9 +27,9 @@ class Relation < ApplicationRecord belongs_to :changeset - has_many :old_relations, -> { order(:version) } + has_many :old_relations, -> { order(:version) }, :inverse_of => :current_relation - has_many :relation_members, -> { order(:sequence_id) } + has_many :relation_members, -> { order(:sequence_id) }, :inverse_of => :relation has_many :relation_tags has_many :containing_relation_members, :class_name => "RelationMember", :as => :member @@ -195,7 +195,7 @@ class Relation < ApplicationRecord end def create_with_history(user) - check_create_consistency(self, user) + check_create_element_consistency(self, user) raise OSM::APIPreconditionFailedError, "Cannot create relation: data or member data is invalid." unless preconditions_ok? self.version = 0 @@ -263,7 +263,7 @@ class Relation < ApplicationRecord private def save_with_history! - t = Time.now.getutc + t = Time.now.utc self.version += 1 self.timestamp = t