X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7609c118843d66c37dd428a2a162a4e15289b6ce..73426ea3838a2f92f5b766b51e017d529c456471:/app/models/old_relation.rb?ds=sidebyside diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb index d0a03ac25..39d53518d 100644 --- a/app/models/old_relation.rb +++ b/app/models/old_relation.rb @@ -31,13 +31,13 @@ class OldRelation < ApplicationRecord include Redactable belongs_to :changeset - belongs_to :redaction + belongs_to :redaction, :optional => true belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id" has_many :old_members, -> { order(:sequence_id) }, :class_name => "OldRelationMember", :foreign_key => [:relation_id, :version] has_many :old_tags, :class_name => "OldRelationTag", :foreign_key => [:relation_id, :version] - validates :changeset, :presence => true, :associated => true + validates :changeset, :associated => true validates :timestamp, :presence => true validates :visible, :inclusion => [true, false] @@ -82,7 +82,7 @@ class OldRelation < ApplicationRecord end def tags - @tags ||= old_tags.collect { |t| [t.k, t.v] }.to_h + @tags ||= old_tags.to_h { |t| [t.k, t.v] } end attr_writer :members, :tags