From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Wed, 18 Feb 2015 12:17:59 +0000 (+0100)
Subject: SONAR-5659 Issues link parameters disappear when fail to log
X-Git-Tag: 5.1-RC1~204
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F97%2Fhead;p=sonarqube.git

SONAR-5659 Issues link parameters disappear when fail to log
---

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/sessions_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/sessions_controller.rb
index 7a7600afa03..cb94561ab1e 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/sessions_controller.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/sessions_controller.rb
@@ -35,6 +35,7 @@ class SessionsController < ApplicationController
       end
       redirect_back_or_default(home_url)
     else
+      @return_to_anchor = params[:return_to_anchor]
       flash.now[:loginerror] = message('session.flash_notice.authentication_failed')
     end
   end
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/sessions/login.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/sessions/login.html.erb
index 0382575d0e2..527ba5e18dd 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/sessions/login.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/sessions/login.html.erb
@@ -3,7 +3,7 @@
 			<td align="center">
 				<div id="login_form">
 					<form action="<%= url_for :controller => 'sessions', :action => 'login' -%>" method="post">
-            <input type="hidden" name="return_to_anchor" value="">
+            <input type="hidden" name="return_to_anchor" value="<%= @return_to_anchor %>">
 						<h3><%= label_tag message('login') %></h3>
 						<p>
 							<%= text_field_tag 'login', '', {:maxlength => 255, :disabled => false, :style => 'width:200px;'} %>
@@ -31,5 +31,7 @@
 	</table>
   <script>
     $j('#login').focus();
-    $j('[name=return_to_anchor]').val(window.location.hash);
+    if (!$j('[name=return_to_anchor]').val()) {
+      $j('[name=return_to_anchor]').val(window.location.hash);
+    }
   </script>