diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-22 15:33:06 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-22 15:33:06 +0100 |
| commit | 39aa7132ceed3d4beab3a9b828e571bbfc67c07e (patch) | |
| tree | 6c88289c9f99be0af8635636fcdf64102090e5ec /app/controllers/users_controller.rb | |
| parent | 5ad8203ce4f1bfea997960d0b52c626dea24b944 (diff) | |
| parent | 6f69c1a85055ec7c2515719d79d2a7a4e60cec50 (diff) | |
Merge branch 'develop'5.1-beta1
Diffstat (limited to 'app/controllers/users_controller.rb')
| -rw-r--r-- | app/controllers/users_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 454c26b..584d08c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -10,7 +10,7 @@ class UsersController < ApplicationController end def show - @phone_books = PhoneBook.accessible_by( Ability.new( @user ) ).all + @phone_books = PhoneBook.accessible_by( Ability.new( @user ), :read ) end def new @@ -52,7 +52,7 @@ class UsersController < ApplicationController def destroy @user.destroy - redirect_to @parent, :notice => t('users.controller.successfuly_destroyed') + redirect_to :back, :notice => t('users.controller.successfuly_destroyed') end def destroy_avatar |