Noam Slomianko has uploaded a new change for review. Change subject: webadmin: show quota tab only for correct DCs ......................................................................
webadmin: show quota tab only for correct DCs - When System was selected in SystemTree the quota tab would not switch out (if it was selected) - When A DataCenter with quota disabled was selected in SystemTree the quota tab would still show Change-Id: I7da842adb808838222e5fa40762e7782cd121f6c Bug-Url: https://bugzilla.redhat.com/911241 Signed-off-by: Noam Slomianko <nslom...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/13305/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java index 2e72e18..1f9f144 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java @@ -4,9 +4,11 @@ import java.util.List; import org.ovirt.engine.core.common.businessentities.AuditLog; +import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum; +import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.VDSGroup; -import org.ovirt.engine.core.common.businessentities.StorageDomain; +import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.compat.RefObject; import org.ovirt.engine.core.compat.Regex; @@ -537,7 +539,14 @@ || model.getType() == SystemTreeItemType.Storages || model.getType() == SystemTreeItemType.Storage || model.getType() == SystemTreeItemType.System); - quotaList.setIsAvailable(model.getType() == SystemTreeItemType.DataCenter); + //only show quota if you select a datacenter that is not "quota disabled" + if(model.getType() == SystemTreeItemType.DataCenter){ + storage_pool dataCenter = (storage_pool)model.getEntity(); + quotaList.setIsAvailable(dataCenter.getQuotaEnforcementType() != QuotaEnforcementTypeEnum.DISABLED); + } else { + quotaList.setIsAvailable(false); + } + boolean isDataStorage = false; if (model.getType() == SystemTreeItemType.Storage) @@ -600,6 +609,7 @@ if (!reportsList.getIsAvailable() || getSelectedItem() != reportsList) { switch (model.getType()) { + case System: case DataCenter: setSelectedItem(dataCenterList); break; -- To view, visit http://gerrit.ovirt.org/13305 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7da842adb808838222e5fa40762e7782cd121f6c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Noam Slomianko <nslom...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
