Liran Zelkha has uploaded a new change for review. Change subject: webadmin: Remove unneccessary queries from Cluster Dialog show ......................................................................
webadmin: Remove unneccessary queries from Cluster Dialog show When the cluster dialog box is opened, it queries the list of Vds and Vms. However, this info is already found in the UI, added in a previous patch http://gerrit.ovirt.org/#/c/26980/ This patch removes the unneeded DB calls Change-Id: I619bb4971e87e7521653469b7c4a9208ca893d0e Bug-Url: https://bugzilla.redhat.com/1139688 Signed-off-by: [email protected] <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java 1 file changed, 8 insertions(+), 30 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/33791/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java index 896d92e6..8f878d8 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java @@ -445,42 +445,20 @@ }; AsyncDataProvider.getVolumeList(asyncQuery, cluster.getName()); - AsyncQuery asyncQuery1 = new AsyncQuery(); - asyncQuery1.setModel(clusterModel); - asyncQuery1.asyncCallback = new INewAsyncCallback() { - @Override - public void onSuccess(Object model1, Object result) + if (cluster.getGroupHostsAndVms().getVms() > 0) { + clusterModel.getEnableOvirtService().setIsChangable(false); + if (!isVirtGlusterAllowed) { - ArrayList<VM> vmList = (ArrayList<VM>) result; - if (vmList.size() > 0) - { - clusterModel.getEnableOvirtService().setIsChangable(false); - if (!isVirtGlusterAllowed) - { - clusterModel.getEnableGlusterService().setIsChangable(false); - } - } + clusterModel.getEnableGlusterService().setIsChangable(false); } }; - AsyncDataProvider.getVmListByClusterName(asyncQuery1, cluster.getName()); - AsyncQuery asyncQuery2 = new AsyncQuery(); - asyncQuery2.setModel(clusterModel); - asyncQuery2.asyncCallback = new INewAsyncCallback() { - @Override - public void onSuccess(Object model1, Object result) - { - ArrayList<VDS> vdsList = (ArrayList<VDS>) result; - if (vdsList.size() > 0) - { - clusterModel.getEnableTrustedService().setIsChangable(false); - clusterModel.getEnableTrustedService().setChangeProhibitionReason( - ConstantsManager.getInstance() + if (cluster.getGroupHostsAndVms().getHosts() > 0) { + clusterModel.getEnableTrustedService().setIsChangable(false); + clusterModel.getEnableTrustedService().setChangeProhibitionReason( + ConstantsManager.getInstance() .getConstants() .trustedServiceDisabled()); - } - } }; - AsyncDataProvider.getHostListByCluster(asyncQuery2, cluster.getName()); } })); -- To view, visit http://gerrit.ovirt.org/33791 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I619bb4971e87e7521653469b7c4a9208ca893d0e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Liran Zelkha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
