Kanagaraj M has uploaded a new change for review. Change subject: webadmin: fix system-tree navigation for gluster volumes ......................................................................
webadmin: fix system-tree navigation for gluster volumes Volumes with same name can be present in two different cluster. So added cluster name also to the search string. Also fixed the issue in selecting hosts part of gluster cluster. Change-Id: I579bbe1f7b0a27cf0ee806554810a01a962cd71c Bug-Url: https://bugzilla.redhat.com/973960 Signed-off-by: Kanagaraj M <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java 1 file changed, 14 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/16226/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 303a053..0db75cc 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 @@ -583,7 +583,8 @@ eventList.setIsAvailable(model.getType() == SystemTreeItemType.DataCenter || model.getType() == SystemTreeItemType.Cluster || model.getType() == SystemTreeItemType.Cluster_Gluster || model.getType() == SystemTreeItemType.Host - || model.getType() == SystemTreeItemType.Storage || model.getType() == SystemTreeItemType.System); + || model.getType() == SystemTreeItemType.Storage || model.getType() == SystemTreeItemType.System + || model.getType() == SystemTreeItemType.Volume); reportsList.setIsAvailable(ReportInit.getInstance().isReportsEnabled() && ReportInit.getInstance().getDashboard(model.getType().toString()) != null); @@ -1121,7 +1122,11 @@ case Hosts: { if (hostList.isSearchStringMatch(source)) { - prefix.argvalue = "Host: cluster = " + SystemTreeItemModel.findAncestor(SystemTreeItemType.Cluster, model).getTitle(); //$NON-NLS-1$ + SystemTreeItemModel cluster = SystemTreeItemModel.findAncestor(SystemTreeItemType.Cluster, model); + if(cluster == null) { + cluster = SystemTreeItemModel.findAncestor(SystemTreeItemType.Cluster_Gluster, model); + } + prefix.argvalue = "Host: cluster = " + cluster.getTitle(); //$NON-NLS-1$ } } break; @@ -1156,7 +1161,11 @@ case Volumes: { if (volumeList.isSearchStringMatch(source)) { - prefix.argvalue = "Volume: cluster = " + SystemTreeItemModel.findAncestor(SystemTreeItemType.Cluster, model).getTitle(); //$NON-NLS-1$ + SystemTreeItemModel cluster = SystemTreeItemModel.findAncestor(SystemTreeItemType.Cluster, model); + if (cluster == null) { + cluster = SystemTreeItemModel.findAncestor(SystemTreeItemType.Cluster_Gluster, model); + } + prefix.argvalue = "Volume: cluster = " + cluster.getTitle(); //$NON-NLS-1$ } } break; @@ -1164,23 +1173,15 @@ case Volume: { if (volumeList.isSearchStringMatch(source)) { - prefix.argvalue = "Volume: name = " + model.getTitle(); //$NON-NLS-1$ + prefix.argvalue = "Volume: name = " + model.getTitle() + " cluster = " + SystemTreeItemModel.findAncestor(SystemTreeItemType.Cluster_Gluster, model).getTitle(); //$NON-NLS-1$ } else if (clusterList.isSearchStringMatch(source)) { prefix.argvalue = "Cluster: volume.name = " + model.getTitle(); //$NON-NLS-1$ } - else if (dataCenterList.isSearchStringMatch(source)) - { - prefix.argvalue = "DataCenter: volume.name = " + model.getTitle(); //$NON-NLS-1$ - } - else if (templateList.isSearchStringMatch(source)) - { - prefix.argvalue = "Template: Volumes.name = " + model.getTitle(); //$NON-NLS-1$ - } else if (eventList.isSearchStringMatch(source)) { - prefix.argvalue = "Events: volume.name = " + model.getTitle(); //$NON-NLS-1$ + prefix.argvalue = "Events: volume.name = " + model.getTitle() + " cluster = " + SystemTreeItemModel.findAncestor(SystemTreeItemType.Cluster_Gluster, model).getTitle(); //$NON-NLS-1$ } } break; -- To view, visit http://gerrit.ovirt.org/16226 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I579bbe1f7b0a27cf0ee806554810a01a962cd71c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kanagaraj M <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
