Hello Noam Slomianko,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/19972
to review the following change.
Change subject: webadmin: Disable + sign in custom properties
......................................................................
webadmin: Disable + sign in custom properties
When there are no more possible values disable the + sign
in custom properties
Change-Id: I40e391566dd3bcced2a345ce6a56e2244ac94294
Bug-Url: https://bugzilla.redhat.com/1001159
Signed-off-by: Noam Slomianko <[email protected]>
Signed-off-by: Gilad Chaplik <[email protected]>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueWidget.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/key_value/KeyValueModel.java
3 files changed, 27 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/19972/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.java
index ee3a0f8..d337353 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.java
@@ -84,7 +84,6 @@
object.getAddLine().execute();
}
});
-
minusButton.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
@@ -137,4 +136,12 @@
this.enabled = enabled;
}
+ public void setPlusButtonEnabled(boolean enabled) {
+ plusButton.setEnabled(enabled);
+ }
+
+ public void setMinusButtonEnabled(boolean enabled) {
+ minusButton.setEnabled(enabled);
+ }
+
}
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueWidget.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueWidget.java
index 7716b25..545b06b 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueWidget.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueWidget.java
@@ -67,6 +67,13 @@
panel.add(keyValueLineWidget);
keyValueLineWidget.edit(keyValueLineModel);
keyValueLineWidget.setEnabled(enabled);
+
+ if (list.size() == 1 && object.keysUsedCount() == 0) {
+ keyValueLineWidget.setMinusButtonEnabled(false);
+ }
+ if (list.size() >= object.possibleKeysCount()) {
+ keyValueLineWidget.setPlusButtonEnabled(false);
+ }
}
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/key_value/KeyValueModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/key_value/KeyValueModel.java
index dedda24..43e6234 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/key_value/KeyValueModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/key_value/KeyValueModel.java
@@ -213,6 +213,18 @@
}
}
+ public int keysUsedCount() {
+ if (keyValueMap_used == null
+ || keyValueMap_used.containsKey(NO_KEYS)) {
+ return 0;
+ }
+ return keyValueMap_used.size();
+ }
+
+ public int possibleKeysCount() {
+ return allKeyValueMap == null ? 0 : allKeyValueMap.size();
+ }
+
@Override
public void addLine(KeyValueLineModel lineModel) {
List<KeyValueLineModel> list =
--
To view, visit http://gerrit.ovirt.org/19972
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40e391566dd3bcced2a345ce6a56e2244ac94294
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Gilad Chaplik <[email protected]>
Gerrit-Reviewer: Noam Slomianko <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
