Ravi Nori has uploaded a new change for review. Change subject: engine: Hosts SearchBox doesn't filter correctly ......................................................................
engine: Hosts SearchBox doesn't filter correctly Hosts - SearchBox "Host:user.usrname =*" doesn't filter correctly Change-Id: I420b7705596335b9be6d6d8374a11f7542a03db9 Bug-Url: https://bugzilla.redhat.com/1006231 Signed-off-by: Ravi Nori <rn...@redhat.com> --- M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java 2 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/22438/1 diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java index 979ecd1..26e71f8 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java @@ -152,6 +152,9 @@ //users - template addJoin(SearchObjects.VDC_USER_OBJ_NAME, "vm_guid", SearchObjects.TEMPLATE_OBJ_NAME, "vmt_guid"); + + //users - host + addJoin(SearchObjects.VDC_USER_OBJ_NAME, "vm_guid", SearchObjects.VDS_OBJ_NAME, "vds_id"); } private void addJoin(String firstObj, String firstColumnName, String secondObj, String secondColumnName) { diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java index 6e5a454..ea20035 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java @@ -719,8 +719,7 @@ } } else if (SearchObjects.VDS_OBJ_NAME.equals(searchObjStr)) { - if ((refObjList.contains(SearchObjects.VDC_USER_OBJ_NAME)) - || (refObjList.contains(SearchObjects.TEMPLATE_OBJ_NAME))) { + if (refObjList.contains(SearchObjects.TEMPLATE_OBJ_NAME)) { innerJoins.addFirst(mSearchObjectAC.getInnerJoin(SearchObjects.VDS_OBJ_NAME, SearchObjects.VM_OBJ_NAME)); if (refObjList.contains(SearchObjects.VM_OBJ_NAME)) { @@ -728,7 +727,7 @@ } } if (refObjList.contains(SearchObjects.VDC_USER_OBJ_NAME)) { - innerJoins.addLast(mSearchObjectAC.getInnerJoin(SearchObjects.VM_OBJ_NAME, + innerJoins.addLast(mSearchObjectAC.getInnerJoin(SearchObjects.VDS_OBJ_NAME, SearchObjects.VDC_USER_OBJ_NAME)); refObjList.remove(SearchObjects.VDC_USER_OBJ_NAME); } -- To view, visit http://gerrit.ovirt.org/22438 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I420b7705596335b9be6d6d8374a11f7542a03db9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <rn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
