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: If2d398edcebadd77f05c0e669c7f581ca67501c3 Bug-Url: https://bugzilla.redhat.com/1139688 Signed-off-by: lzel...@redhat.com <lzel...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java 1 file changed, 20 insertions(+), 36 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/33513/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 3060a90..a451e07 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 @@ -426,53 +426,37 @@ @Override public void onSuccess(Object model, Object returnValue) { final boolean isVirtGlusterAllowed = (Boolean) returnValue; - AsyncQuery asyncQuery = new AsyncQuery(); - asyncQuery.setModel(clusterModel); - asyncQuery.asyncCallback = new INewAsyncCallback() { - @Override - public void onSuccess(Object model1, Object result) { - ArrayList<GlusterVolumeEntity> volumes = (ArrayList<GlusterVolumeEntity>) result; - if (volumes.size() > 0) { - clusterModel.getEnableGlusterService().setIsChangable(false); - if (!isVirtGlusterAllowed) { - clusterModel.getEnableOvirtService().setIsChangable(false); - } - } - } - }; - AsyncDataProvider.getInstance().getVolumeList(asyncQuery, cluster.getName()); - AsyncQuery asyncQuery1 = new AsyncQuery(); - asyncQuery1.setModel(clusterModel); - asyncQuery1.asyncCallback = new INewAsyncCallback() { - @Override - public void onSuccess(Object model1, Object result) { - ArrayList<VM> vmList = (ArrayList<VM>) result; - if (vmList.size() > 0) { + AsyncQuery asyncQuery = new AsyncQuery(); + asyncQuery.setModel(clusterModel); + asyncQuery.asyncCallback = new INewAsyncCallback() { + @Override + public void onSuccess(Object model1, Object result) { + ArrayList<GlusterVolumeEntity> volumes = (ArrayList<GlusterVolumeEntity>) result; + if (volumes.size() > 0) { + clusterModel.getEnableGlusterService().setIsChangable(false); + if (!isVirtGlusterAllowed) { + clusterModel.getEnableOvirtService().setIsChangable(false); + } + } + } + }; + AsyncDataProvider.getInstance().getVolumeList(asyncQuery, cluster.getName()); + + if (cluster.getGroupHostsAndVms().getVms() > 0) { clusterModel.getEnableOvirtService().setIsChangable(false); if (!isVirtGlusterAllowed) { clusterModel.getEnableGlusterService().setIsChangable(false); } - } - } - }; - AsyncDataProvider.getInstance().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) { + }; + + if (cluster.getGroupHostsAndVms().getHosts() > 0) { clusterModel.getEnableTrustedService().setIsChangable(false); clusterModel.getEnableTrustedService().setChangeProhibitionReason( ConstantsManager.getInstance() .getConstants() .trustedServiceDisabled()); } - } - }; - AsyncDataProvider.getInstance().getHostListByCluster(asyncQuery2, cluster.getName()); } })); -- To view, visit http://gerrit.ovirt.org/33513 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If2d398edcebadd77f05c0e669c7f581ca67501c3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liran Zelkha <lzel...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
