app/models/ucb_rails/user.rb in ucb_rails-0.0.13 vs app/models/ucb_rails/user.rb in ucb_rails-0.0.14
- old
+ new
@@ -1,45 +1,53 @@
class UcbRails::User < ActiveRecord::Base
self.table_name = 'users'
-
- attr_accessible :uid, :first_name, :last_name, :inactive
-
+
+ # attr_accessible :uid, :first_name, :last_name, :inactive
+
before_validation :set_first_last_name
-
+
# Overridden by application
def roles
[]
end
-
+
def has_role?(role)
admin? || roles.include?(role)
end
-
+
def active?
!inactive?
end
-
+
def admin!(_admin=true)
update_attribute(:admin, _admin)
end
-
+
def inactive!(_inactive=true)
update_attribute(:inactive, _inactive)
end
-
+
def self.active
where(inactive: false)
end
-
+
def self.admin
where(admin: true)
end
-
+
+ def ldap_entry
+ UcbRails::LdapPerson::Finder.find_by_uid!(uid)
+ end
+
+ def full_name
+ "#{first_name} #{last_name}"
+ end
+
private
-
+
def set_first_last_name
self.first_last_name = [first_name, last_name]
.select { |n| n.present? }
.join(' ')
.presence
end
-end
\ No newline at end of file
+end