WIP adding user roles view; adding end datetime to user roles

This commit is contained in:
John N. Milner
2013-04-18 22:16:13 -04:00
parent ac9e5718c7
commit a3fcdec10c
10 changed files with 62 additions and 17 deletions
+5 -1
View File
@@ -14,7 +14,7 @@ class User < ActiveRecord::Base
has_many :user_profiles
accepts_nested_attributes_for :user_profiles, allow_destroy: false
belongs_to :user_role
has_one :user_role
belongs_to :bike
validates :first_name, :presence => true
@@ -24,6 +24,10 @@ class User < ActiveRecord::Base
"#{first_name} #{last_name}"
end
def full_name
to_s
end
def role
user_role.role
end
+1 -1
View File
@@ -1,7 +1,7 @@
class UserRole < ActiveRecord::Base
attr_accessible :role
has_many :users
belongs_to :user
self.per_page = 15