diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-06 14:32:38 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-06 14:32:38 -0400 |
| commit | cfaff7870d0348b25b3b4b2597950894ab25d989 (patch) | |
| tree | 5efb02d4e8a7c602ba680dfe450a14a81597be55 /app/controllers | |
| parent | 2da3c10d18856c254457a3106eb8f1762b5077a9 (diff) | |
implement editing the default user permissions
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/servers_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/users_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb index e3850b8..83a9f31 100644 --- a/app/controllers/servers_controller.rb +++ b/app/controllers/servers_controller.rb @@ -31,6 +31,6 @@ class ServersController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def server_params - params.require(:server).permit(:default_user_permissions) + params.require(:server).permit(:default_user_permissions, :default_user_abilities => User.permission_bits.keys) end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index dd66c18..637480f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -33,7 +33,7 @@ class UsersController < ApplicationController return end - @user.permissions = 0 + @user.permissions = Server.first.default_user_permissions respond_to do |format| if @user.save sign_in @user |