From b43b1b849ea20bdaabed2e4655a9a0213b6570f8 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Mon, 3 Mar 2014 09:30:27 +0100
Subject: [PATCH] Process login link in order to add the anchor

---
 .../WEB-INF/app/views/layouts/_layout.html.erb    |  2 +-
 .../src/main/webapp/javascripts/application.js    | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
index e477dcc3edd..48e9b19095e 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
@@ -38,7 +38,7 @@
         <% if logged_in? %>
           <%= render 'layouts/menu_user' -%>
         <% else %>
-          <li><a href="<%= ApplicationController.root_context -%>/sessions/new?return_to=<%= u (request.request_uri) -%>"><%= message('layout.login') -%></a></li>
+          <li><a id="login-link" href="<%= ApplicationController.root_context -%>/sessions/new?return_to=<%= u (request.request_uri) -%>"><%= message('layout.login') -%></a></li>
         <% end %>
         <% if is_admin? %>
           <li><a href="<%= ApplicationController.root_context -%>/settings/index" class="<%= 'selected' if selected_section==Navigation::SECTION_CONFIGURATION -%>"><%= message('layout.settings') -%></a></li>
diff --git a/sonar-server/src/main/webapp/javascripts/application.js b/sonar-server/src/main/webapp/javascripts/application.js
index 65fa62fce16..2fa6cca9e28 100644
--- a/sonar-server/src/main/webapp/javascripts/application.js
+++ b/sonar-server/src/main/webapp/javascripts/application.js
@@ -533,9 +533,24 @@ function openPopup(url, popupId) {
 
 
 jQuery(function() {
+
+  // Initialize top search
   jQuery('#searchInput').topSearch({
     minLength: 2,
     results: '#searchResourcesResults',
     spinner: '#searchingResources'
   });
+
+
+  // Process login link in order to add the anchor
+  jQuery('#login-link').on('click', function(e) {
+    e.preventDefault();
+    var href = jQuery(this).prop('href'),
+        hash = window.location.hash;
+    if (hash.length > 0) {
+      href += decodeURIComponent(hash);
+    }
+    window.location = href;
+  });
 });
+
-- 
2.39.5