Allon Mureinik has uploaded a new change for review. Change subject: userportal: No MLA filtering for VM disks ......................................................................
userportal: No MLA filtering for VM disks Since disks are retrieved per VM, and we know the user has permissions for it, there is no need to re-filter the disks. Change-Id: I82e8f110652b875b44d0fd0b02bbd51a8e7cc56b Related-to: https://bugzilla.redhat.com/show_bug.cgi?id=971237 Signed-off-by: Allon Mureinik <[email protected]> --- M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmBasicDiskListModel.java 2 files changed, 19 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/16396/1 diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java index 5cd3c10..8ae3bf0 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java @@ -188,8 +188,15 @@ } public static void RunQuery(final VdcQueryType queryType, - final VdcQueryParametersBase parameters, - final AsyncQuery callback) { + final VdcQueryParametersBase parameters, + final AsyncQuery callback) { + RunQuery(queryType, parameters, callback, null); + } + + public static void RunQuery(final VdcQueryType queryType, + final VdcQueryParametersBase parameters, + final AsyncQuery callback, + final Boolean forceFilter) { final QueryWrapper queryWrapper = new QueryWrapper(queryType, parameters, callback); final boolean isHandleSequentialQueries = isHandleSequentialQueries(queryWrapper); if (isHandleSequentialQueries) { @@ -201,7 +208,11 @@ } } - initQueryParamsFilter(parameters); + if (forceFilter != null) { + parameters.setFiltered(forceFilter); + } else { + initQueryParamsFilter(parameters); + } dumpQueryDetails(queryType, parameters); logger.finer("Frontend: Invoking async runQuery."); //$NON-NLS-1$ raiseQueryStartedEvent(queryType, callback.getContext()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmBasicDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmBasicDiskListModel.java index 201f25a..bcf8686 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmBasicDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmBasicDiskListModel.java @@ -56,10 +56,11 @@ } }; + // Since we know we have permissions for the VM, there is no need to MLA-filter the disks IdQueryParameters queryParameters = new IdQueryParameters(vm.getId()); queryParameters.setRefresh(getIsQueryFirstTime()); Frontend.RunQuery(VdcQueryType.GetAllDisksByVmId, queryParameters, - _asyncQuery); + _asyncQuery, Boolean.FALSE); } else if (getEntity() instanceof VmPool) { @@ -93,10 +94,12 @@ searchableListModel.setItems(diskList); } }; + + // Since we know we have permissions for the VM, there is no need to MLA-filter the disks IdQueryParameters queryParameters = new IdQueryParameters(vm.getId()); queryParameters.setRefresh(getIsQueryFirstTime()); Frontend.RunQuery(VdcQueryType.GetAllDisksByVmId, queryParameters, - _asyncQuery1); + _asyncQuery1, Boolean.FALSE); } } }; -- To view, visit http://gerrit.ovirt.org/16396 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82e8f110652b875b44d0fd0b02bbd51a8e7cc56b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
