ofri masad has uploaded a new change for review. Change subject: webadmin: Add quota validator to Edit-Disk ......................................................................
webadmin: Add quota validator to Edit-Disk Trying to add disk was failing with no visible reason when no quota was selected. Added a validator to the Edit-Disk view. fixed permission issue when empty quota is selected Change-Id: Ic8f750f50a6ff201c55da325bfd4b3c5c9468822 Signed-off-by: Ofri Masad <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java 2 files changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/10146/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java index 20bd121..e3ec1d1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java @@ -888,7 +888,9 @@ if (consumptionParameters != null) { for (QuotaConsumptionParameter parameter : getQuotaConsumptionParameters()) { - quotaPermissionList.add(new PermissionSubject(parameter.getQuotaGuid(), VdcObjectType.Quota, ActionGroup.CONSUME_QUOTA)); + if (parameter.getQuotaGuid() != null && parameter.getQuotaGuid() != Guid.Empty) { + quotaPermissionList.add(new PermissionSubject(parameter.getQuotaGuid(), VdcObjectType.Quota, ActionGroup.CONSUME_QUOTA)); + } } } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java index e205310..815802a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java @@ -44,6 +44,7 @@ import org.ovirt.engine.ui.uicommonweb.validation.IValidation; import org.ovirt.engine.ui.uicommonweb.validation.IntegerValidation; import org.ovirt.engine.ui.uicommonweb.validation.NotEmptyValidation; +import org.ovirt.engine.ui.uicommonweb.validation.NotEmptyQuotaValidation; import org.ovirt.engine.ui.uicompat.ConstantsManager; public class DiskModel extends Model @@ -994,7 +995,12 @@ isSanStorageModelValid = getSanStorageModel().getIsValid(); } + storage_pool dataCenter = (storage_pool) getDataCenter().getSelectedItem(); + if (dataCenter != null && dataCenter.getQuotaEnforcementType() == QuotaEnforcementTypeEnum.HARD_ENFORCEMENT) { + getQuota().ValidateSelectedItem(new IValidation[] { new NotEmptyQuotaValidation() }); + } + return getSize().getIsValid() && getStorageDomain().getIsValid() && getAlias().getIsValid() - && isSanStorageModelValid; + && isSanStorageModelValid && getQuota().getIsValid(); } } -- To view, visit http://gerrit.ovirt.org/10146 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8f750f50a6ff201c55da325bfd4b3c5c9468822 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: ofri masad <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
