Merge pull request #6325 from himdel/change_group-api

Fix logout on group change
ManageIQ · Oct 23, 2019 · b59885c · b59885c
2 parents c300913 + 36e1bae
commit b59885c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/app/assets/javascripts/miq_application.js b/app/assets/javascripts/miq_application.js
@@ -696,16 +696,6 @@ function miqEnterPressed(e) {
   return (keycode === 13);
 }
 
-function storeUserFeatures() {
-  delete window.localStorage.userFeatures;
-  return window.http.get('/api?attributes=identity')
-    .then(function(data) {
-      window.localStorage.userFeatures = JSON.stringify(data.identity.miq_groups.find(function(group) {
-        return data.identity.group === group.description;
-      }).product_features);
-    });
-}
-
 // Send login authentication via ajax
 function miqAjaxAuth(url) {
   miqEnableLoginFields(false);
@@ -977,9 +967,14 @@ function miqShowAE_Tree(typ) {
   return true;
 }
 
-// Toggle the user options div in the page header
-function miqToggleUserOptions(id) {
-  miqJqueryRequest(miqPassFields('/dashboard/change_group', {to_group: id}), { done: storeUserFeatures });
+// Toggle the user options div in the page header (:onclick from layouts/user_options)
+function miqChangeGroup(id) {
+  miqSparkleOn();
+
+  // prevent login redirect once current requests fail after the group gets changed
+  ManageIQ.logoutInProgress = true;
+
+  miqJqueryRequest(miqPassFields('/dashboard/change_group', {to_group: id}));
 }
 
 // Check for enter/escape on quick search box
@@ -1552,7 +1547,7 @@ var fontIconChar = _.memoize(function(klass) {
 
 function redirectLogin(msg) {
   if (ManageIQ.logoutInProgress) {
-    return; // prevent double redirect after pressing the Logout button
+    return; // prevent double redirect after pressing the Logout button or when changing group
   }
 
   add_flash(msg, 'warning');

diff --git a/app/assets/javascripts/miq_global.js b/app/assets/javascripts/miq_global.js
@@ -48,7 +48,7 @@ if (!window.ManageIQ) {
     i18n: {
       mark_translated_strings: false,
     },
-    logoutInProgress: false,  // prevent redirectLogin *during* logout
+    logoutInProgress: false,  // prevent redirectLogin *during* logout and group change
     mouse: {
       x: null, // mouse X coordinate for popup menu
       y: null, // mouse Y coordinate for popup menu

diff --git a/app/views/layouts/_user_options.html.haml b/app/views/layouts/_user_options.html.haml
@@ -30,7 +30,7 @@
                   %li
                     %a{:title   => _("Change to this Group"),
                       :href     => "#",
-                      :onclick  => "miqSparkle(true); miqToggleUserOptions(#{group.id})"}
+                      :onclick  => "miqChangeGroup('#{j_str group.id}')"}
                       = group.description
       - else
         %li.disabled