diff options
| author | Azul <azul@leap.se> | 2012-12-06 12:30:58 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-06 12:30:58 +0100 |
| commit | 2885145729cbba9a933a8a2ff33c4fd99f08e0fb (patch) | |
| tree | d6c3cc84ef294c54c198b78b4e3e3e787735eb50 /users/app | |
| parent | ea3718c34cccd294865c0dd533db0b4aa18015cc (diff) | |
| parent | 1b411de39f38eb0925cf255e941545933f227759 (diff) | |
Merge branch 'feature/user-cancel-account' into develop
Diffstat (limited to 'users/app')
| -rw-r--r-- | users/app/controllers/users_controller.rb | 2 | ||||
| -rw-r--r-- | users/app/views/users/edit.html.haml | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb index 3407191..cffc8c6 100644 --- a/users/app/controllers/users_controller.rb +++ b/users/app/controllers/users_controller.rb @@ -36,7 +36,7 @@ class UsersController < ApplicationController def destroy @user.destroy - redirect_to users_path + redirect_to admin? ? users_path : login_path end protected diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml index 8298443..cfcf220 100644 --- a/users/app/views/users/edit.html.haml +++ b/users/app/views/users/edit.html.haml @@ -1,3 +1,10 @@ .span8.offset2 %h2=t :settings = render 'form' + - if @user == current_user + %legend + =t :cancel_account + %small You will not be able to login anymore. + = link_to user_path(@user), :method => :delete, :class => "btn btn-danger" do + %i.icon-remove.icon-white + Remove my Account |