Przeglądaj źródła

HUE-3798 [core] Re-login from auto-login popup should refresh the page if login as another user

Enrico Berti 9 lat temu
rodzic
commit
81043be

+ 8 - 3
desktop/core/src/desktop/templates/common_footer.mako

@@ -75,9 +75,14 @@ ${ smart_unicode(login_modal(request).content) | n,unicode }
 
     huePubSub.subscribe('hue.login.result', function (response) {
       if (response.auth) {
-        $('#login-modal').modal('hide');
-        $.jHueNotify.info('${ _('You have signed in successfully!') }');
-        $('#login-modal .login-error').addClass('hide');
+        if ($('#login-modal #id_username').val() !== LOGGED_USERNAME) { //LOGGED_USERNAME is in common_header
+          location.reload();
+        }
+        else {
+          $('#login-modal').modal('hide');
+          $.jHueNotify.info('${ _('You have signed in successfully!') }');
+          $('#login-modal .login-error').addClass('hide');
+        }
       }
       else {
         $('#login-modal .login-error').removeClass('hide');

+ 2 - 0
desktop/core/src/desktop/templates/common_header.mako

@@ -107,6 +107,8 @@ if USE_NEW_EDITOR.get():
 
   <script type="text/javascript" charset="utf-8">
 
+    var LOGGED_USERNAME = '${ user.username }';
+
     // jHue plugins global configuration
     jHueFileChooserGlobals = {
       labels: {