Эх сурвалжийг харах

HUE-8709 [useradmin] Fix black transparent screen remains after confirmation modal is hidden

Ying Chen 6 жил өмнө
parent
commit
afa1f28e07

+ 2 - 2
apps/useradmin/src/useradmin/templates/list_groups.mako

@@ -170,11 +170,11 @@ ${layout.menubar(section='groups')}
     $groupsComponents.find('.delete-group form').ajaxForm({
       dataType:  'json',
       success: function(data) {
+        $groupsComponents.find(".delete-group").modal("hide");
+        $.jHueNotify.info("${ _('The groups were deleted.') }");
         if (data && data.url){
           huePubSub.publish('open.link', data.url);
         }
-        $.jHueNotify.info("${ _('The groups were deleted.') }");
-        $groupsComponents.find(".delete-group").modal("hide");
       }
     });
     % endif

+ 7 - 7
apps/useradmin/src/useradmin/templates/list_users.mako

@@ -200,20 +200,20 @@ ${layout.menubar(section='users')}
     $usersComponents.find('.delete-user form').ajaxForm({
       dataType:  'json',
       success: function(data) {
+        $usersComponents.find(".delete-user").modal("hide");
+        $.jHueNotify.info("${ _('The users were deleted.') }")
         if (data && data.url){
           huePubSub.publish('open.link', data.url);
         }
-        $.jHueNotify.info("${ _('The users were deleted.') }")
-        $usersComponents.find(".delete-user").modal("hide");
       },
       error: function(response, status, err) {
+        $usersComponents.find(".delete-user").modal("hide");
         if (response.responseJSON && response.responseJSON.message && response.status == 401) {
           $.jHueNotify.error(response.responseJSON.message);
         }
         else {
           $.jHueNotify.error("${ _('An unknown error has occurred while deleting the user. Please try again.') }");
         }
-        $usersComponents.find(".delete-user").modal("hide");
       }
     });
     % endif
@@ -243,16 +243,16 @@ ${layout.menubar(section='users')}
                 renderUseradminErrors(data.errors);
               }
               else if (data && data.url) {
-                huePubSub.publish('open.link', data.url);
-                $.jHueNotify.info("${ _('The users and groups were updated correctly.') }")
                 $usersComponents.find(".sync-ldap").modal("hide");
+                $.jHueNotify.info("${ _('The users and groups were updated correctly.') }");
+                huePubSub.publish('open.link', data.url);
               }
             },
             error: function(data) {
               $usersComponents.find('input[type="submit"]').removeAttr("disabled");
-              huePubSub.publish('open.link', data.url);
-              $.jHueNotify.error(data.responseJSON['message']);
               $usersComponents.find(".sync-ldap").modal("hide");
+              $.jHueNotify.error(data.responseJSON['message']);
+              huePubSub.publish('open.link', data.url);
             }
           });
           % endif