Ignore legacy moderator and admin columns on User model (#29188)
This commit is contained in:
		@@ -25,7 +25,15 @@ module User::LdapAuthenticable
 | 
			
		||||
      resource = joins(:account).find_by(accounts: { username: safe_username })
 | 
			
		||||
 | 
			
		||||
      if resource.blank?
 | 
			
		||||
        resource = new(email: attributes[Devise.ldap_mail.to_sym].first, agreement: true, account_attributes: { username: safe_username }, admin: false, external: true, confirmed_at: Time.now.utc)
 | 
			
		||||
        resource = new(
 | 
			
		||||
          email: attributes[Devise.ldap_mail.to_sym].first,
 | 
			
		||||
          agreement: true,
 | 
			
		||||
          account_attributes: {
 | 
			
		||||
            username: safe_username,
 | 
			
		||||
          },
 | 
			
		||||
          external: true,
 | 
			
		||||
          confirmed_at: Time.now.utc
 | 
			
		||||
        )
 | 
			
		||||
        resource.save!
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -32,7 +32,6 @@ module User::PamAuthenticable
 | 
			
		||||
 | 
			
		||||
      self.email        = "#{account.username}@#{find_pam_suffix}" if email.nil? && find_pam_suffix
 | 
			
		||||
      self.confirmed_at = Time.now.utc
 | 
			
		||||
      self.admin        = false
 | 
			
		||||
      self.account      = account
 | 
			
		||||
      self.external     = true
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user