[BZ 1344334] Enable buttons in discovery queue no matter how askbox i…

…s closed
rhq-project · Oct 30, 2017 · 1c3fe4e · 1c3fe4e
1 parent 980b136
commit 1c3fe4e
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/...n/java/org/rhq/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java b/...n/java/org/rhq/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java
@@ -215,33 +215,26 @@ public void execute(Boolean confirmed) {
                                     if (confirmed) {
                                         selectAllPlatformChildren(selectedNode);
                                     }
-                                    updateButtonEnablement(selectAllButton, deselectAllButton, importButton,
-                                        ignoreButton, unignoreButton);
-                                    selectionChangedHandlerDisabled = false;
                                 }
+                                updateButtonEnablement(selectAllButton, deselectAllButton, importButton,
+                                        ignoreButton, unignoreButton);
+                                selectionChangedHandlerDisabled = false;
                             }
                         });
                     } else {
                         selectedNode.setAttribute("autoSelectChildren", "false");
                         treeGrid.deselectRecords(treeGrid.getTree().getChildren(selectedNode));
-
-                        // the immediate redraw below should not be necessary, but without it the deselected
-                        // platform checkbox remained checked.
-                        // treeGrid.redraw();
-                        updateButtonEnablement(selectAllButton, deselectAllButton, importButton, ignoreButton,
-                            unignoreButton);
-                        selectionChangedHandlerDisabled = false;
                     }
                 } else {
                     if (isCheckboxMarked) {
                         if (!treeGrid.isSelected(parentNode)) {
                             treeGrid.selectRecord(parentNode);
                         }
                     }
-                    updateButtonEnablement(selectAllButton, deselectAllButton, importButton, ignoreButton,
-                        unignoreButton);
-                    selectionChangedHandlerDisabled = false;
                 }
+                updateButtonEnablement(selectAllButton, deselectAllButton, importButton, ignoreButton,
+                        unignoreButton);
+                selectionChangedHandlerDisabled = false;
             }
 
         });