From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Wed, 20 Jul 2016 06:48:10 +0000 (+0200)
Subject: SONAR-7761 Restore error in login page when not even privilege
X-Git-Tag: 6.0-RC2~16
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3e18ba2c5d266c37a0ca2bb6b9c3588628a3fbe4;p=sonarqube.git

SONAR-7761 Restore error in login page when not even privilege
---

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/sessions/_form.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/sessions/_form.html.erb
index 4495fffa997..3cb6a3187e0 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/sessions/_form.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/sessions/_form.html.erb
@@ -22,7 +22,13 @@
 <form id="login_form" action="<%= ApplicationController.root_context -%>/api/authentication/login" method="post">
   <input type="hidden" name="return_to_anchor" value="<%= h @return_to_anchor %>">
 
-  <div class="alert alert-danger hidden"><%= message('session.flash_notice.authentication_failed') %></div>
+  <div class="alert alert-danger alert-authentication-failed hidden"><%= message('session.flash_notice.authentication_failed') %></div>
+  <% if flash[:loginerror] %>
+    <div class="alert alert-danger alert-flash"> <%= flash[:loginerror] %></div>
+  <% end %>
+  <% if flash[:notice] %>
+    <div class="alert alert-info alert-flash"><%= flash[:notice] %></div>
+  <% end %>
 
   <div class="big-spacer-bottom">
     <label for="login" class="login-label"><%= message('login') %></label>
@@ -62,7 +68,8 @@
         window.location = '<%= h(@return_to) -%>' + $('[name="return_to_anchor"]').val();
       },
       error: function () {
-        $('.alert').removeClass('hidden');
+        $('.alert-flash').addClass('hidden');
+        $('.alert-authentication-failed').removeClass('hidden');
         $('button').prop('disabled', false);
       },
       statusCode: {