Alexander Wels has uploaded a new change for review. Change subject: userportal: Refresh stops session timeout. ......................................................................
userportal: Refresh stops session timeout. - Fixed issue where the automatic refresh of VM and templates would reset the session timeout due to not passing in the proper parameters. Change-Id: I499dfc3cd2ce4385bb81a62133124accfbfebfbd Signed-off-by: Alexander Wels <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalTemplateListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmBasicDiskListModel.java 5 files changed, 15 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/15134/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java index 1c68619..6cb959d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java @@ -1345,9 +1345,10 @@ aQuery); } - public static void getAllVmTemplates(AsyncQuery aQuery) { + public static void getAllVmTemplates(AsyncQuery aQuery, final boolean refresh) { aQuery.converterCallback = new TemplateConverter(); VdcQueryParametersBase params = new VdcQueryParametersBase(); + params.setRefresh(refresh); Frontend.RunQuery(VdcQueryType.GetAllVmTemplates, params, aQuery); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java index 684ccf2..2e1dd42 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java @@ -125,8 +125,9 @@ protected void syncSearch() { super.syncSearch(); - Frontend.RunQuery(VdcQueryType.GetAllVmsAndVmPools, - new VdcQueryParametersBase(), + VdcQueryParametersBase queryParameters = new VdcQueryParametersBase(); + queryParameters.setRefresh(getIsQueryFirstTime()); + Frontend.RunQuery(VdcQueryType.GetAllVmsAndVmPools, queryParameters, new AsyncQuery(this, new INewAsyncCallback() { @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java index a0cba31..9ddbe77 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java @@ -326,8 +326,9 @@ protected void syncSearch() { super.syncSearch(); - Frontend.RunQuery(VdcQueryType.GetAllVmsAndVmPools, - new VdcQueryParametersBase(), + VdcQueryParametersBase queryParameters = new VdcQueryParametersBase(); + queryParameters.setRefresh(getIsQueryFirstTime()); + Frontend.RunQuery(VdcQueryType.GetAllVmsAndVmPools, queryParameters, new AsyncQuery(this, new INewAsyncCallback() { @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalTemplateListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalTemplateListModel.java index 7099529..46a272b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalTemplateListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalTemplateListModel.java @@ -28,7 +28,7 @@ public void onSuccess(Object model, Object returnValue) { ((UserPortalTemplateListModel) model).setItems((Iterable) returnValue); } - })); + }),getIsQueryFirstTime()); } @Override 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 ae77dc1..17d16fd 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 @@ -57,8 +57,9 @@ } }; - Frontend.RunQuery(VdcQueryType.GetAllDisksByVmId, - new GetAllDisksByVmIdParameters(vm.getId()), + GetAllDisksByVmIdParameters queryParameters = new GetAllDisksByVmIdParameters(vm.getId()); + queryParameters.setRefresh(getIsQueryFirstTime()); + Frontend.RunQuery(VdcQueryType.GetAllDisksByVmId, queryParameters, _asyncQuery); } else if (getEntity() instanceof VmPool) @@ -93,8 +94,9 @@ searchableListModel.setItems(diskList); } }; - Frontend.RunQuery(VdcQueryType.GetAllDisksByVmId, - new GetAllDisksByVmIdParameters(vm.getId()), + GetAllDisksByVmIdParameters queryParameters = new GetAllDisksByVmIdParameters(vm.getId()); + queryParameters.setRefresh(getIsQueryFirstTime()); + Frontend.RunQuery(VdcQueryType.GetAllDisksByVmId, queryParameters, _asyncQuery1); } } -- To view, visit http://gerrit.ovirt.org/15134 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I499dfc3cd2ce4385bb81a62133124accfbfebfbd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
