Shahar Havivi has uploaded a new change for review. Change subject: webadmin: Add VM Id to the general VMs subtab ......................................................................
webadmin: Add VM Id to the general VMs subtab Change-Id: I7e8f274fcaa53afaa755b88766da3ed627141917 Bug-Url: https://bugzilla.redhat.com/982050 Signed-off-by: Shahar Havivi <[email protected]> --- 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/vm/VmGeneralModelForm.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java 3 files changed, 27 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/17657/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 8bd85bb..aeb44bf 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 @@ -1560,4 +1560,7 @@ @DefaultStringValue("Memory Balloon Device Enabled") String memoryBalloonDeviceEnabled(); + + @DefaultStringValue("Vm Id") + String vmId(); } 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 867fe0d..ce76af8 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 @@ -34,6 +34,7 @@ TextBoxLabel customProperties = new TextBoxLabel(); TextBoxLabel domain = new TextBoxLabel(); TextBoxLabel compatibilityVersion = new TextBoxLabel(); + TextBoxLabel vmId = new TextBoxLabel(); BooleanLabel isHighlyAvailable; @@ -43,7 +44,7 @@ private final Driver driver = GWT.create(Driver.class); public VmGeneralModelForm(ModelProvider<VmGeneralModel> modelProvider, CommonApplicationConstants constants) { - super(modelProvider, 3, 6); + super(modelProvider, 3, 7); isHighlyAvailable = new BooleanLabel(constants.yes(), constants.no()); driver.initialize(this); @@ -66,7 +67,9 @@ 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 FormItem(constants.vmId(), vmId, 4, 2)); + + formBuilder.addFormItem(new FormItem(constants.quotaVm(), quotaName, 5, 2) { @Override public boolean getIsAvailable() { return getModel().isQuotaAvailable(); @@ -78,7 +81,7 @@ return quotaName == null || "".equals(quotaName); } }); - formBuilder.addFormItem(new FormItem(constants.domainVm(), domain, 5, 2) { + formBuilder.addFormItem(new FormItem(constants.domainVm(), domain, 6, 2) { @Override public boolean getIsAvailable() { return getModel().getHasDomain(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java index 0a69841..e2b7415 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java @@ -468,6 +468,22 @@ } } + private String vmId; + + public String getVmId() + { + return vmId; + } + + public void setVmId(String value) + { + if (!StringHelper.stringsEqual(vmId, value)) + { + vmId = value; + onPropertyChanged(new PropertyChangedEventArgs("VmId")); //$NON-NLS-1$ + } + } + private String compatibilityVersion; public String getCompatibilityVersion() @@ -563,6 +579,8 @@ setCompatibilityVersion(vm.getVdsGroupCompatibilityVersion() != null ? vm.getVdsGroupCompatibilityVersion().toString() : ""); //$NON-NLS-1$ + setVmId(vm.getId().toString()); + setHasAlert(vm.getVmPauseStatus() != VmPauseStatus.NONE && vm.getVmPauseStatus() != VmPauseStatus.NOERR); if (getHasAlert()) { -- To view, visit http://gerrit.ovirt.org/17657 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7e8f274fcaa53afaa755b88766da3ed627141917 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
