summaryrefslogtreecommitdiff
path: root/users/app/controllers/users_controller.rb
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-11-23 11:00:32 +0100
committerAzul <azul@leap.se>2012-11-23 11:00:32 +0100
commit716dc248e940be8bd323a9d92f98785737fc99a0 (patch)
treedebf0bcb697bfdf29d1710096752e3c6d94d4f79 /users/app/controllers/users_controller.rb
parentddd53a0841cb2af091e1ed3a6e69e9fc52977c08 (diff)
parent46c0140a8eab632c783d309a7afd87cb7aad4280 (diff)
Merge branch 'feature/users-change-passwords' into develop
Diffstat (limited to 'users/app/controllers/users_controller.rb')
-rw-r--r--users/app/controllers/users_controller.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index 82d2eac..ecab53b 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -15,4 +15,14 @@ class UsersController < ApplicationController
@user = e.document
respond_with(@user, :location => new_user_path)
end
+
+ def edit
+ @user = current_user
+ end
+
+ def update
+ @user = current_user
+ @user.update(params[:user])
+ respond_with(@user, :location => edit_user_path(@user))
+ end
end