Greg Sheremeta has uploaded a new change for review. Change subject: webadmin: fix tabs shown/hidden when tags selected/unselected ......................................................................
webadmin: fix tabs shown/hidden when tags selected/unselected Fixed tab show logic so that when a tag is selected, only Hosts, VMs, and Users tabs are visible. When no tag is selected, tabs behave as if System node is selected. Change-Id: I6cace6daecef58ee2726a22e880d5c31e03e275f Bug-Url: https://bugzilla.redhat.com/1006282 Bug-Url: https://bugzilla.redhat.com/996594 Signed-off-by: Greg Sheremeta <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java 1 file changed, 19 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/19813/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java index 6b4d728..ba74c67 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java @@ -413,6 +413,12 @@ setHasSelectedTags(getSelectedItem() != null && selectedTags.size() > 0); } + private void setAllListModelsUnavailable() { + for (ListModel m : getItems()) { + m.setIsAvailable(false); + } + } + private void tagListModel_SelectedItemsChanged(Object sender, EventArgs e) { // Reset system tree to the root item. @@ -423,21 +429,20 @@ boolean hadSelectedTags = getHasSelectedTags(); updateHasSelectedTags(); - dataCenterList.setIsAvailable(!getHasSelectedTags()); - clusterList.setIsAvailable(!getHasSelectedTags()); - hostList.setIsAvailable(true); - storageList.setIsAvailable(!getHasSelectedTags()); - vmList.setIsAvailable(true); - volumeList.setIsAvailable(true); - poolList.setIsAvailable(!getHasSelectedTags()); + // When any tags are selected, only show Hosts, VMs, and Users tabs. + // These are currently the only nodes for which tags can be assigned. + // When no tags are selected, show the exact same main tabs that are + // displayed when the "System" node in the system tree is selected. - templateList.setIsAvailable(!getHasSelectedTags()); - userList.setIsAvailable(true); - eventList.setIsAvailable(!getHasSelectedTags()); - reportsList.setIsAvailable(ReportInit.getInstance().isReportsEnabled() && !getHasSelectedTags()); - networkList.setIsAvailable(!getHasSelectedTags()); - providerList.setIsAvailable(!getHasSelectedTags()); - profileList.setIsAvailable(!getHasSelectedTags()); + if (getHasSelectedTags()) { + setAllListModelsUnavailable(); + hostList.setIsAvailable(true); + vmList.setIsAvailable(true); + userList.setIsAvailable(true); + } + else { + updateAvailability(SystemTreeItemType.System, null); + } // Switch the selected item as neccessary. ListModel oldSelectedItem = getSelectedItem(); -- To view, visit http://gerrit.ovirt.org/19813 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6cace6daecef58ee2726a22e880d5c31e03e275f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Greg Sheremeta <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
