Arik Hadas has uploaded a new change for review. Change subject: webadmin: Allow to change version name of template ......................................................................
webadmin: Allow to change version name of template It is now possible to change the name of a template sub-version from the template's edit dialog. Note that it is only allowed for sub-versions, for base versions the version name is "base version" and the text box is disabled. Change-Id: I3c33a8b87f5df7e3dbc23bfcb97cc839b0b6b7bb Bug-Url: https://bugzilla.redhat.com/1058501 Signed-off-by: Arik Hadas <aha...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolEditPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolNewPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmClonePopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmPopupWidget.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java 7 files changed, 19 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/25768/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java index 1a136af..ee9565e 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java @@ -158,6 +158,11 @@ public StringEntityModelTextBoxOnlyEditor nameEditor; @UiField(provided = true) + @Path(value = "templateVersionName.entity") + @WithElementId("templateVersionName") + public StringEntityModelTextBoxEditor templateVersionNameEditor; + + @UiField(provided = true) @Ignore public InfoIcon poolNameIcon; @@ -776,6 +781,7 @@ } private void initTextBoxEditors() { + templateVersionNameEditor = new StringEntityModelTextBoxEditor(new ModeSwitchingVisibilityRenderer()); descriptionEditor = new StringEntityModelTextBoxEditor(new ModeSwitchingVisibilityRenderer()); commentEditor = new StringEntityModelTextBoxEditor(new ModeSwitchingVisibilityRenderer()); numOfVmsEditor = new IntegerEntityModelTextBoxEditor(new ModeSwitchingVisibilityRenderer()); @@ -1059,6 +1065,7 @@ dataCenterWithClusterEditor.setLabel(constants.hostClusterVmPopup()); quotaEditor.setLabel(constants.quotaVmPopup()); nameLabel.setText(constants.nameVmPopup()); + templateVersionNameEditor.setLabel(constants.templateVersionName()); descriptionEditor.setLabel(constants.descriptionVmPopup()); commentEditor.setLabel(constants.commentLabel()); baseTemplateEditor.setLabel(constants.basedOnTemplateVmPopup()); @@ -1496,6 +1503,7 @@ templateEditor.setTabIndex(nextTabIndex++); nameEditor.setTabIndex(nextTabIndex++); + templateVersionNameEditor.setTabIndex(nextTabIndex++); descriptionEditor.setTabIndex(nextTabIndex++); commentEditor.setTabIndex(nextTabIndex++); isStatelessEditor.setTabIndex(nextTabIndex++); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml index 381b0ef..22dc0a8 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml @@ -236,7 +236,7 @@ width: 250px; } - .prestartedLabel, .nameLabel { + .prestartedLabel, .nameLabel, .templateVersionNameLabel { float: left; color: #333333; } @@ -370,6 +370,7 @@ </g:FlowPanel> <ge:EntityModelTextBoxOnlyEditor ui:field="nameEditor" addStyleNames="{style.nameEditor}" contentWidgetStyleName="{style.nameEditorContent}"/> </g:FlowPanel> + <ge:StringEntityModelTextBoxEditor ui:field="templateVersionNameEditor" /> <ge:StringEntityModelTextBoxEditor ui:field="descriptionEditor" /> <ge:StringEntityModelTextBoxEditor ui:field="commentEditor" /> diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolEditPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolEditPopupWidget.java index d90ad5e..3b5f2fb 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolEditPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolEditPopupWidget.java @@ -119,7 +119,8 @@ update(newPoolEditMaxAssignedVmsPerUserPanel, hiddenField()). update(editPoolEditVmsPanel, simpleField()). update(editPoolIncraseNumOfVmsPanel, simpleField()). - update(editPoolEditMaxAssignedVmsPerUserPanel, simpleField()); + update(editPoolEditMaxAssignedVmsPerUserPanel, simpleField()). + update(templateVersionNameEditor, hiddenField()); } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolNewPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolNewPopupWidget.java index 3422905..4b30264 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolNewPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolNewPopupWidget.java @@ -90,7 +90,8 @@ putOne(editPoolEditVmsPanel, hiddenField()). putOne(editPoolIncraseNumOfVmsPanel, hiddenField()). putOne(logicalNetworksEditorPanel, hiddenField()). - putOne(editPoolEditMaxAssignedVmsPerUserPanel, hiddenField()); + putOne(editPoolEditMaxAssignedVmsPerUserPanel, hiddenField()). + update(templateVersionNameEditor, hiddenField()); } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmClonePopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmClonePopupWidget.java index d55e684..662f62c 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmClonePopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmClonePopupWidget.java @@ -35,7 +35,7 @@ return super.createWidgetConfiguration(). putAll(poolSpecificFields(), hiddenField()). putOne(logicalNetworksEditorPanel, hiddenField()). - update(consoleTab, simpleField().visibleInAdvancedModeOnly()); - + update(consoleTab, simpleField().visibleInAdvancedModeOnly()). + update(templateVersionNameEditor, hiddenField()); } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmPopupWidget.java index f1744d4..5345732 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmPopupWidget.java @@ -46,6 +46,7 @@ @Override protected PopupWidgetConfigMap createWidgetConfiguration() { return super.createWidgetConfiguration(). - putAll(poolSpecificFields(), hiddenField()); + putAll(poolSpecificFields(), hiddenField()). + update(templateVersionNameEditor, hiddenField()); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java index 56a3ce9..cb90817 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java @@ -215,6 +215,7 @@ updateConsoleDevice(template.getId()); getModel().getVmInitEnabled().setEntity(template.getVmInit() != null); getModel().getVmInitModel().init(template); + getModel().getTemplateVersionName().setEntity(template.getTemplateVersionName()); initPriority(template.getPriority()); } -- To view, visit http://gerrit.ovirt.org/25768 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c33a8b87f5df7e3dbc23bfcb97cc839b0b6b7bb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <aha...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
