diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-19 19:11:57 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-19 19:11:57 -0400 |
commit | 458085f34f4ed79e7dbc6a01c5e52706814fb69e (patch) | |
tree | 8e1654e3e1a38f2a6189b05fe6e8cd5421d6b5f2 | |
parent | cb79e5ec9846f7ee2a76ced3f87bb3ff67e1dfd5 (diff) |
Set the default user permissions in the model instead of controller
-rw-r--r-- | app/controllers/users_controller.rb | 1 | ||||
-rw-r--r-- | app/models/user.rb | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 637480f..c3261b8 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -33,7 +33,6 @@ class UsersController < ApplicationController return end - @user.permissions = Server.first.default_user_permissions respond_to do |format| if @user.save sign_in @user diff --git a/app/models/user.rb b/app/models/user.rb index 3407355..575c741 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,4 +1,6 @@ class User < ActiveRecord::Base + before_save :default_values + has_and_belongs_to_many :tournaments_played, class_name: "Tournament", foreign_key: "player_id", join_table: "players_tournaments" has_and_belongs_to_many :tournaments_hosted, class_name: "Tournament", foreign_key: "host_id", join_table: "hosts_tournaments" has_and_belongs_to_many :teams @@ -10,6 +12,10 @@ class User < ActiveRecord::Base before_save { self.email = email.downcase } before_save { self.user_name = user_name } + def default_values + self.permissions ||= Server.first.default_user_permissions + end + def self.permission_bits return { :create_tournament => (2**1), |