Ravi Nori has uploaded a new change for review. Change subject: engine: SearchBox doesnt display Templates in search for Users ......................................................................
engine: SearchBox doesnt display Templates in search for Users Searching for Users who have permissions on a template does not show any results, always returns empty list of users. Change-Id: Ibc15f4144e129a5dc36e9ee52cb0033b143a16a3 Bug-Url: https://bugzilla.redhat.com/1005836 Signed-off-by: Ravi Nori <[email protected]> --- 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/73/22373/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 81ef42a..979ecd1 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 @@ -149,6 +149,9 @@ // provider - network addJoin(SearchObjects.PROVIDER_OBJ_NAME, "id", SearchObjects.NETWORK_OBJ_NAME, "provider_network_provider_id"); + + //users - template + addJoin(SearchObjects.VDC_USER_OBJ_NAME, "vm_guid", SearchObjects.TEMPLATE_OBJ_NAME, "vmt_guid"); } 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 aa91d0d..6e5a454 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 @@ -739,8 +739,7 @@ } } else if (SearchObjects.VDC_USER_OBJ_NAME.equals(searchObjStr)) { - if ((refObjList.contains(SearchObjects.VDS_OBJ_NAME)) - || (refObjList.contains(SearchObjects.TEMPLATE_OBJ_NAME))) { + if ((refObjList.contains(SearchObjects.VDS_OBJ_NAME))) { innerJoins.addFirst(mSearchObjectAC.getInnerJoin(SearchObjects.VDC_USER_OBJ_NAME, SearchObjects.VM_OBJ_NAME)); if (refObjList.contains(SearchObjects.VM_OBJ_NAME)) { @@ -753,7 +752,7 @@ refObjList.remove(SearchObjects.VDS_OBJ_NAME); } if (refObjList.contains(SearchObjects.TEMPLATE_OBJ_NAME)) { - innerJoins.addLast(mSearchObjectAC.getInnerJoin(SearchObjects.VM_OBJ_NAME, + innerJoins.addLast(mSearchObjectAC.getInnerJoin(SearchObjects.VDC_USER_OBJ_NAME, SearchObjects.TEMPLATE_OBJ_NAME)); refObjList.remove(SearchObjects.TEMPLATE_OBJ_NAME); } -- To view, visit http://gerrit.ovirt.org/22373 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc15f4144e129a5dc36e9ee52cb0033b143a16a3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
