diff --git a/app/models/user.rb b/app/models/user.rb index d558f87..d5164a0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -15,7 +15,7 @@ class User < ActiveRecord::Base validates :username, :presence => true, :uniqueness => true # Setup accessible (or protected) attributes for your model - attr_accessible :username, :email, :password, :password_confirmation, :remember_me, :is_admin + attr_accessible :username, :email, :password, :password_confirmation, :remember_me, :role_id has_many :topics, :dependent => :destroy has_many :posts, :dependent => :destroy diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb index e7f22dc..6e85390 100755 --- a/app/views/users/_form.html.erb +++ b/app/views/users/_form.html.erb @@ -13,10 +13,10 @@ <%= f.label :username %> <%= f.text_field :username %> - -

- Administrator   <%= f.check_box :is_admin, {checked: @user.admin?} %> -

+ +
+ + <%= collection_select(:user, :role_id, Role.all, :id, :name) %> <%= f.label :email %> <%= f.email_field :email %>