summaryrefslogtreecommitdiff
path: root/users/app/controllers
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2013-12-09 10:14:17 -0800
committerazul <azul@riseup.net>2013-12-09 10:14:17 -0800
commit0f2e1316894cdffac47448b6ddbf2cfaf5f93a55 (patch)
treeae2577c3584e66ffa2937ad9807e32cc6ff49db3 /users/app/controllers
parente7e5dac36127a36cac9ed35054767d04b2e5ae17 (diff)
parent6ebf095bc553345a3e0b8c48cadc3e1440c59ca5 (diff)
Merge pull request #119 from jessib/feature/service_level
Feature/service level
Diffstat (limited to 'users/app/controllers')
-rw-r--r--users/app/controllers/users_controller.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index 3cbb6dc..8b4715c 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -34,6 +34,12 @@ class UsersController < UsersBaseController
def edit
end
+ ## added so updating service level works, but not sure we will actually want this. also not sure that this is place to prevent user from updating own effective service level, but here as placeholder:
+ def update
+ @user.update_attributes(params[:user]) unless (!admin? and params[:user][:effective_service_level])
+ respond_with @user
+ end
+
def deactivate
@user.enabled = false
@user.save