jro_apps/redmine Commit - r10057:c68ee7f5458d

Fixed that destroying a user from the edit page returns a 404 response (#11691)....

Jean-Philippe Lang -

r10057:c68ee7f5458d

parent child

Context file:

r10057:c68ee7f5458d

app/controllers/users_controller.rb +1 -1

               def destroy
                 @user.destroy
                 respond_to do |format|
-                  format.html { redirect_to_referer_or(users_url) }
+                  format.html { redirect_back_or_default(users_url) }
                   format.api  { render_api_ok }
                 end
               end

app/views/users/index.html.erb +1 -1

               <td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
                 <td class="buttons">
                   <%= change_status_link(user) %>
-                  <%= delete_link user_path(user) unless User.current == user %>
+                  <%= delete_link user_path(user, :back_url => users_path(params)) unless User.current == user %>
                 </td>
               </tr>
             <% end -%>

test/functional/users_controller_test.rb +7 0

                 assert_response 403
               end
+              def test_destroy_should_redirect_to_back_url_param
+                assert_difference 'User.count', -1 do
+                  delete :destroy, :id => 2, :back_url => '/users?name=foo'
+                end
+                assert_redirected_to '/users?name=foo'
+              end
               def test_create_membership
                 assert_difference 'Member.count' do
                   post :edit_membership, :id => 7, :membership => { :project_id => 3, :role_ids => [2]}

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages