Vojtech Szocs has uploaded a new change for review. Change subject: webadmin,userportal: Fix CommonModel search string regression ......................................................................
webadmin,userportal: Fix CommonModel search string regression Patch [58a8ec Element IDs in System Tree and Tags] introduced TreeNodeInfo interface and made SystemTreeItemModel implement this interface to support dealing with physical parent/child relationship within a System Tree node hierarchy. The above mentioned patch also corrected some physical parent/child relationships (calls to setParent method) in SystemTreeModel. However, some code in CommonModel relies on (logical) parent/child relationships that were corrected in above mentioned patch, which causes a regression in CommonModel for computing some search strings. This patch fixes the above mentioned problem by using SystemTreeItemModel findAncestor method, which traverses up the (physical) parent node hierarchy to find the correct (logical) tree node, assuming the logical node is always reachable from given physical node (by traversing up). Change-Id: I79f2e9f18e08b89cdfe84d4657bce1de8f8988bb Signed-off-by: Vojtech Szocs <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/15086/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 0ed37f0..0a1776e 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 @@ -1068,7 +1068,7 @@ case Clusters: { if (clusterList.isSearchStringMatch(source)) { - prefix.argvalue = "Cluster: datacenter.name = " + model.getParent().getTitle(); //$NON-NLS-1$ + prefix.argvalue = "Cluster: datacenter.name = " + SystemTreeItemModel.findAncestor(SystemTreeItemType.DataCenter, model.getParent()).getTitle(); //$NON-NLS-1$ } } break; @@ -1116,7 +1116,7 @@ case Hosts: { if (hostList.isSearchStringMatch(source)) { - prefix.argvalue = "Host: cluster = " + model.getParent().getTitle(); //$NON-NLS-1$ + prefix.argvalue = "Host: cluster = " + SystemTreeItemModel.findAncestor(SystemTreeItemType.Cluster, model.getParent()).getTitle(); //$NON-NLS-1$ } } break; @@ -1151,7 +1151,7 @@ case Volumes: { if (volumeList.isSearchStringMatch(source)) { - prefix.argvalue = "Volume: cluster = " + model.getParent().getTitle(); //$NON-NLS-1$ + prefix.argvalue = "Volume: cluster = " + SystemTreeItemModel.findAncestor(SystemTreeItemType.Cluster, model.getParent()).getTitle(); //$NON-NLS-1$ } } break; @@ -1182,7 +1182,7 @@ case Storages: { if (storageList.isSearchStringMatch(source)) { - prefix.argvalue = "Storage: datacenter = " + model.getParent().getTitle(); //$NON-NLS-1$ + prefix.argvalue = "Storage: datacenter = " + SystemTreeItemModel.findAncestor(SystemTreeItemType.DataCenter, model.getParent()).getTitle(); //$NON-NLS-1$ } } break; @@ -1224,44 +1224,44 @@ case Templates: { if (templateList.isSearchStringMatch(source)) { - prefix.argvalue = "Template: datacenter = " + model.getParent().getTitle(); //$NON-NLS-1$ + prefix.argvalue = "Template: datacenter = " + SystemTreeItemModel.findAncestor(SystemTreeItemType.DataCenter, model.getParent()).getTitle(); //$NON-NLS-1$ } } break; case VMs: { if (vmList.isSearchStringMatch(source)) { - prefix.argvalue = "Vms: cluster = " + model.getParent().getTitle(); //$NON-NLS-1$ + prefix.argvalue = "Vms: cluster = " + SystemTreeItemModel.findAncestor(SystemTreeItemType.Cluster, model.getParent()).getTitle(); //$NON-NLS-1$ } } break; case Networks: { if (networkList.isSearchStringMatch(source)) { - prefix.argvalue = "Network: datacenter = " + model.getParent().getTitle(); //$NON-NLS-1$ + prefix.argvalue = "Network: datacenter = " + SystemTreeItemModel.findAncestor(SystemTreeItemType.DataCenter, model.getParent()).getTitle(); //$NON-NLS-1$ } } break; case Network: { if (networkList.isSearchStringMatch(source)) { - prefix.argvalue = "Network: name = " + model.getTitle() + " datacenter = " + model.getParent().getTitle(); //$NON-NLS-1$ //$NON-NLS-2$ + prefix.argvalue = "Network: name = " + model.getTitle() + " datacenter = " + SystemTreeItemModel.findAncestor(SystemTreeItemType.DataCenter, model.getParent()).getTitle(); //$NON-NLS-1$ //$NON-NLS-2$ } else if (clusterList.isSearchStringMatch(source)) { - prefix.argvalue = "Cluster: Cluster_network.network_name = " + model.getTitle() + " Datacenter.name = " + model.getParent().getTitle(); //$NON-NLS-1$ //$NON-NLS-2$ + prefix.argvalue = "Cluster: Cluster_network.network_name = " + model.getTitle() + " Datacenter.name = " + SystemTreeItemModel.findAncestor(SystemTreeItemType.DataCenter, model.getParent()).getTitle(); //$NON-NLS-1$ //$NON-NLS-2$ } else if (hostList.isSearchStringMatch(source)) { - prefix.argvalue = "Host : Nic.network_name = " + model.getTitle() + " datacenter = " + model.getParent().getTitle(); //$NON-NLS-1$ //$NON-NLS-2$ + prefix.argvalue = "Host : Nic.network_name = " + model.getTitle() + " datacenter = " + SystemTreeItemModel.findAncestor(SystemTreeItemType.DataCenter, model.getParent()).getTitle(); //$NON-NLS-1$ //$NON-NLS-2$ } else if (vmList.isSearchStringMatch(source)) { - prefix.argvalue = "Vm : Vnic.network_name = " + model.getTitle() + " datacenter = " + model.getParent().getTitle(); //$NON-NLS-1$ //$NON-NLS-2$ + prefix.argvalue = "Vm : Vnic.network_name = " + model.getTitle() + " datacenter = " + SystemTreeItemModel.findAncestor(SystemTreeItemType.DataCenter, model.getParent()).getTitle(); //$NON-NLS-1$ //$NON-NLS-2$ } else if (templateList.isSearchStringMatch(source)) { - prefix.argvalue = "Template : Vnic.network_name = " + model.getTitle() + " datacenter = " + model.getParent().getTitle(); //$NON-NLS-1$ //$NON-NLS-2$ + prefix.argvalue = "Template : Vnic.network_name = " + model.getTitle() + " datacenter = " + SystemTreeItemModel.findAncestor(SystemTreeItemType.DataCenter, model.getParent()).getTitle(); //$NON-NLS-1$ //$NON-NLS-2$ } } break; -- To view, visit http://gerrit.ovirt.org/15086 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I79f2e9f18e08b89cdfe84d4657bce1de8f8988bb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vojtech Szocs <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
