Gilad Chaplik has uploaded a new change for review.
Change subject: webadmin: quota: general subtab: set empty label
......................................................................
webadmin: quota: general subtab: set empty label
In case quota is enforced, and not configured per vm/template,
set the general-subtab quota name label with not-configured.
Change-Id: I500aca2003f31c7bd77b501a734224d082002740
Signed-off-by: Gilad Chaplik <gchap...@redhat.com>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateGeneralModelForm.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java
3 files changed, 34 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/13924/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
index 4d4745a..cf7ca42 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
@@ -1208,4 +1208,7 @@
@DefaultStringValue("Details")
String details();
+
+ @DefaultStringValue("Not Configured")
+ String notConfigured();
}
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateGeneralModelForm.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateGeneralModelForm.java
index 19e4ca0..e819d6f 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateGeneralModelForm.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateGeneralModelForm.java
@@ -3,6 +3,8 @@
import org.ovirt.engine.ui.common.CommonApplicationConstants;
import org.ovirt.engine.ui.common.uicommon.model.ModelProvider;
import org.ovirt.engine.ui.common.widget.form.FormItem;
+import org.ovirt.engine.ui.common.widget.form.FormItemWithDefaultValue;
+import
org.ovirt.engine.ui.common.widget.form.FormItemWithDefaultValue.Condition;
import org.ovirt.engine.ui.common.widget.label.BooleanLabel;
import org.ovirt.engine.ui.common.widget.label.TextBoxLabel;
import org.ovirt.engine.ui.common.widget.uicommon.AbstractModelBoundFormWidget;
@@ -84,7 +86,19 @@
}
});
- formBuilder.addFormItem(new FormItem(constants.quotaTemplateGeneral(),
quotaName, 4, 2) {
+ formBuilder.addFormItem(new
FormItemWithDefaultValue(constants.quotaTemplateGeneral(),
+ quotaName,
+ 4,
+ 2,
+ constants.notConfigured(),
+ new Condition() {
+
+ @Override
+ public boolean isTrue() {
+ String quotaName = getModel().getQuotaName();
+ return quotaName != null && quotaName != "";
+ }
+ }) {
@Override
public boolean isVisible() {
return getModel().isQuotaAvailable();
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java
index 952504c..0bbf075 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java
@@ -3,6 +3,8 @@
import org.ovirt.engine.ui.common.CommonApplicationConstants;
import org.ovirt.engine.ui.common.uicommon.model.ModelProvider;
import org.ovirt.engine.ui.common.widget.form.FormItem;
+import org.ovirt.engine.ui.common.widget.form.FormItemWithDefaultValue;
+import
org.ovirt.engine.ui.common.widget.form.FormItemWithDefaultValue.Condition;
import org.ovirt.engine.ui.common.widget.label.BooleanLabel;
import org.ovirt.engine.ui.common.widget.label.TextBoxLabel;
import org.ovirt.engine.ui.common.widget.uicommon.AbstractModelBoundFormWidget;
@@ -10,7 +12,6 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.editor.client.SimpleBeanEditorDriver;
-
public class VmGeneralModelForm extends
AbstractModelBoundFormWidget<VmGeneralModel> {
interface Driver extends SimpleBeanEditorDriver<VmGeneralModel,
VmGeneralModelForm> {
@@ -85,7 +86,20 @@
formBuilder.addFormItem(new FormItem(constants.runOnVm(), defaultHost,
1, 2));
formBuilder.addFormItem(new FormItem(constants.customPropertiesVm(),
customProperties, 2, 2));
formBuilder.addFormItem(new
FormItem(constants.clusterCompatibilityVersionVm(), compatibilityVersion, 3,
2));
- formBuilder.addFormItem(new FormItem(constants.quotaVm(), quotaName,
4, 2) {
+
+ formBuilder.addFormItem(new
FormItemWithDefaultValue(constants.quotaVm(),
+ quotaName,
+ 4,
+ 2,
+ constants.notConfigured(),
+ new Condition() {
+
+ @Override
+ public boolean isTrue() {
+ String quotaName = getModel().getQuotaName();
+ return quotaName != null && quotaName != "";
+ }
+ }) {
@Override
public boolean isVisible() {
--
To view, visit http://gerrit.ovirt.org/13924
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I500aca2003f31c7bd77b501a734224d082002740
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
