jro_apps/redmine Commit - r10055:3cc6d5e81596

Reverted r10234 and r10235 that broke redirect after login (#11691)....

Jean-Philippe Lang -

r10055:3cc6d5e81596

parent child

Context file:

r10055:3cc6d5e81596

app/controllers/application_controller.rb +1 -1

               end
               def redirect_back_or_default(default)
-                back_url = params[:back_url].to_s
+                back_url = CGI.unescape(params[:back_url].to_s)
                 if !back_url.blank?
                   begin
                     uri = URI.parse(back_url)

app/controllers/users_controller.rb +1 -1

               def destroy
                 @user.destroy
                 respond_to do |format|
-                  format.html { redirect_back_or_default(users_url) }
+                  format.html { redirect_to_referer_or(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, :back_url => users_path(params)) unless User.current == user %>
+                  <%= delete_link user_path(user) unless User.current == user %>
                 </td>
               </tr>
             <% end -%>

test/functional/account_controller_test.rb +2 -2

               def test_login_should_redirect_to_back_url_param
                 # request.uri is "test.host" in test environment
-                post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http://test.host/issues/show/1'
+                post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http%3A%2F%2Ftest.host%2Fissues%2Fshow%2F1'
                 assert_redirected_to '/issues/show/1'
               end
               def test_login_should_not_redirect_to_another_host
-                post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http://test.foo/fake'
+                post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http%3A%2F%2Ftest.foo%2Ffake'
                 assert_redirected_to '/my/page'
               end

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