app/models/cms/fortress/user.rb in cms-fortress-1.3.11 vs app/models/cms/fortress/user.rb in cms-fortress-1.3.12

- old
+ new

@@ -12,10 +12,10 @@ validates_presence_of :password, if: :password_required? validates_confirmation_of :password, if: :password_required? validates_length_of :password, within: Devise.password_length, allow_blank: true devise :database_authenticatable, :recoverable, :rememberable, :trackable, :timeoutable, - :authentication_keys => [:email, :site_id] + :authentication_keys => -> {Cms::Fortress.configuration.login_site_selector ? [:email, :site_id] : [:email]}.call belongs_to :role belongs_to :site, class_name: "Comfy::Cms::Site", foreign_key: :site_id scope :all_super, -> { where(type_id: 1) }