| @@ -169,16 +169,16 class UsersController < ApplicationController | |||||
| 169 | format.api { render_validation_errors(@user) } |
|
169 | format.api { render_validation_errors(@user) } | |
| 170 | end |
|
170 | end | |
| 171 | end |
|
171 | end | |
| 172 | rescue ::ActionController::RedirectBackError |
|
|||
| 173 | redirect_to :controller => 'users', :action => 'edit', :id => @user |
|
|||
| 174 | end |
|
172 | end | |
| 175 |
|
173 | |||
| 176 | def destroy |
|
174 | def destroy | |
| 177 | @user.destroy |
|
175 | @user.destroy | |
| 178 | respond_to do |format| |
|
176 | respond_to do |format| | |
| 179 |
format.html { redirect_to |
|
177 | format.html { redirect_to :back } | |
| 180 | format.api { head :ok } |
|
178 | format.api { head :ok } | |
| 181 | end |
|
179 | end | |
|
|
180 | rescue ::ActionController::RedirectBackError | |||
|
|
181 | redirect_to(users_url) | |||
| 182 | end |
|
182 | end | |
| 183 |
|
183 | |||
| 184 | def edit_membership |
|
184 | def edit_membership | |
General Comments 0
You need to be logged in to leave comments.
Login now