lib/msip/concerns/models/trelacion.rb in msip-2.2.0.alfa3 vs lib/msip/concerns/models/trelacion.rb in msip-2.2.0.beta1

- old
+ new

@@ -1,48 +1,52 @@ +# frozen_string_literal: true module Msip module Concerns module Models module Trelacion extend ActiveSupport::Concern include Msip::Basica included do - self.table_name = 'msip_trelacion' - has_many :persona_trelacion, foreign_key: "id_trelacion", - validate: true, class_name: 'Msip::PersonaTrelacion' - + self.table_name = "msip_trelacion" + has_many :persona_trelacion, + foreign_key: "id_trelacion", + validate: true, + class_name: "Msip::PersonaTrelacion" + # no puede usarse cuando es la misma - #belongs_to :invtrelacion, foreign_key: "inverso", - #validate: true, class_name: 'Msip::Trelacion' + # belongs_to :invtrelacion, foreign_key: "inverso", + # validate: true, class_name: 'Msip::Trelacion' - validates :id, presence: true, allow_blank: false, - length: { maximum: 2} + validates :id, + presence: true, + allow_blank: false, + length: { maximum: 2 } validates_uniqueness_of :id, case_sensitive: false - validates :inverso, presence: true, allow_blank: false, - length: { maximum: 2} - validates :observaciones, length: { maximum: 200} + validates :inverso, + presence: true, + allow_blank: false, + length: { maximum: 2 } + validates :observaciones, length: { maximum: 200 } validate :inverso_existe def inverso_existe - if (inverso.present? && inverso != id && - Msip::Trelacion.where(id: inverso).take == nil) - errors.add :inverso, "no existe relacion con ese código" + if inverso.present? && inverso != id && + Msip::Trelacion.where(id: inverso).take.nil? + errors.add(:inverso, "no existe relacion con ese código") end end def id=(val) self[:id] = val.upcase.squish if val end def inverso=(val) self[:inverso] = val.upcase.squish if val end - end - end end end end -