diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 17:09:29 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 17:09:29 +0100 |
| commit | cc2a6de28e676b5afb73f3fafb5b417301927cc9 (patch) | |
| tree | 4a98c8adf671bb70d71d1e92972dc89b933ed2d9 /app | |
| parent | f2bb713ff7b02485f551fe97071f4af08d957caf (diff) | |
| parent | 3867ea2c1b7b839c1a1afc2a1abaa12f9dba74dd (diff) | |
Merge branch 'fix_update_and_destroy_of_user_groups' into develop
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/user_groups_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/user_groups_controller.rb b/app/controllers/user_groups_controller.rb index 64e7136..ff3292c 100644 --- a/app/controllers/user_groups_controller.rb +++ b/app/controllers/user_groups_controller.rb @@ -30,7 +30,7 @@ class UserGroupsController < ApplicationController def update if @user_group.update_attributes(params[:user_group]) - redirect_to @user_group, :notice => t('user_groups.controller.successfuly_updated') + redirect_to [@parent, @user_group], :notice => t('user_groups.controller.successfuly_updated') else render :edit end @@ -38,7 +38,7 @@ class UserGroupsController < ApplicationController def destroy @user_group.destroy - redirect_to user_groups_url, :notice => t('user_groups.controller.successfuly_destroyed') + redirect_to method( :"#{@parent.class.name.underscore}_user_groups_path" ).(@parent), :notice => t('user_groups.controller.successfuly_destroyed') end private |