Shahar Havivi has uploaded a new change for review. Change subject: ui: ISO domain refresh button is missing ......................................................................
ui: ISO domain refresh button is missing In Run-Once or Add/Edit Vm there is no refresh button. Bug-Id: https://bugzilla.redhat.com/729577 Change-Id: I9d487dd839efccb69940c7cc6ada68b668f8fa2d Signed-off-by: Shahar Havivi <shav...@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/vm/VmRunOncePopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.ui.xml M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java 6 files changed, 72 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/16311/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 d317858..47ea625 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 @@ -66,8 +66,10 @@ import com.google.gwt.text.shared.AbstractRenderer; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiHandler; import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.cellview.client.CellTable.Resources; +import com.google.gwt.user.client.ui.ButtonBase; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HorizontalPanel; @@ -100,6 +102,8 @@ String labelDisabled(); String generalTabExtendedRightWidgetWidth(); + + String cdImageEditor(); } @UiField @@ -521,6 +525,12 @@ @Ignore Panel expanderContent; + @UiField + @Ignore + ButtonBase refreshButton; + + private UnitVmModel unitVmModel; + private final Driver driver = GWT.create(Driver.class); private final CommonApplicationTemplates applicationTemplates; @@ -920,11 +930,13 @@ provisioningThinEditor.addContentWidgetStyleName(style.provisioningRadioContent()); provisioningCloneEditor.addContentWidgetStyleName(style.provisioningRadioContent()); cdAttachedEditor.addContentWidgetStyleName(style.cdAttachedLabelWidth()); + cdImageEditor.addContentWidgetStyleName(style.cdImageEditor()); } @Override public void edit(UnitVmModel model) { super.edit(model); + unitVmModel = model; priorityEditor.setRowData(new ArrayList<EntityModel>()); priorityEditor.edit(model.getPriority()); @@ -935,6 +947,11 @@ hideAlwaysHiddenFields(); } + @UiHandler("refreshButton") + void handleRefreshButtonClick(ClickEvent event) { + unitVmModel.getBehavior().refreshCdImages(); + } + private void initCustomPropertySheet(final UnitVmModel object) { object.getCustomPropertySheet().getKeyValueLines().getItemsChangedEvent().addListener(new IEventListener() { 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 651cf04..89a17dd 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 @@ -7,6 +7,7 @@ xmlns:s="urn:import:org.ovirt.engine.ui.common.widget.uicommon.storage" xmlns:k="urn:import:org.ovirt.engine.ui.common.widget.form.key_value"> + <ui:with field='resources' type='org.ovirt.engine.ui.common.CommonApplicationResources' /> <ui:with field='constants' type='org.ovirt.engine.ui.common.CommonApplicationConstants'/> <ui:style type="org.ovirt.engine.ui.common.widget.uicommon.popup.AbstractVmPopupWidget.Style"> @@ -212,6 +213,23 @@ .headerPanel { padding-bottom: 6px; } + + .refreshButton { + float: right; + font-size: 12px; + height: 14px; + line-height: 14px; + width: 12px; + margin-right: 5px; + padding: 2px; + background: transparent; + border: 1px solid transparent; + } + + .cdImageEditor { + width: 197px; + } + </ui:style> <t:DialogTabPanel width="100%" height="100%"> @@ -445,6 +463,9 @@ <g:HorizontalPanel addStyleNames="{style.attachCdPanel}" verticalAlignment="ALIGN_MIDDLE"> <e:EntityModelCheckBoxEditor label="{constants.attachCdVmPopup}" ui:field="cdAttachedEditor" /> <e:ListModelListBoxEditor ui:field="cdImageEditor" /> + <g:PushButton ui:field="refreshButton" addStyleNames="{style.refreshButton}"> + <g:upFace image='{resources.refreshButtonImage}' /> + </g:PushButton> </g:HorizontalPanel> </g:FlowPanel> <g:FlowPanel ui:field="linuxBootOptionsPanel" addStyleNames="{style.sectionPanel}" visible="false"> diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.java index 33679b6..0b07d42 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.java @@ -217,6 +217,12 @@ @WithElementId("defaultHost") public ListModelListBoxEditor<Object> defaultHostEditor; + @UiField + @Ignore + ButtonBase refreshButton; + + private RunOnceModel runOnceModel; + private BootSequenceModel bootSequenceModel; private final Driver driver = GWT.create(Driver.class); @@ -333,6 +339,7 @@ @Override public void edit(final RunOnceModel object) { driver.edit(object); + runOnceModel = object; object.getCustomPropertySheet().getKeyValueLines().getItemsChangedEvent().addListener(new IEventListener() { @Override @@ -404,6 +411,11 @@ UpdateBootSequenceListBox(); } + @UiHandler("refreshButton") + void handleRefreshButtonClick(ClickEvent event) { + runOnceModel.updateIsoList(); + } + @UiHandler("bootSequenceUpButton") void handleBootSequenceUpButtonClick(ClickEvent event) { if (bootSequenceModel != null) { diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.ui.xml index e9cdcb3..ede5671 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.ui.xml @@ -127,6 +127,18 @@ .radioButtonSpecificHost { margin-left: 5px; } + + .refreshButton { + float: right; + font-size: 12px; + height: 14px; + line-height: 14px; + width: 12px; + margin-top: 5px; + padding: 2px; + background: transparent; + border: 1px solid transparent; + } </ui:style> <g:FlowPanel> @@ -141,6 +153,9 @@ <g:HorizontalPanel> <e:EntityModelCheckBoxEditor ui:field="attachIsoEditor" addStyleNames="{style.attachImageCheckbox}" /> <e:ListModelListBoxEditor ui:field="isoImageEditor" addStyleNames="{style.attachImageSelectbox}" /> + <g:PushButton ui:field="refreshButton" addStyleNames="{style.refreshButton}"> + <g:upFace image='{resources.refreshButtonImage}' /> + </g:PushButton> </g:HorizontalPanel> </g:VerticalPanel> diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java index a59c54e..9d8647a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java @@ -27,11 +27,11 @@ import org.ovirt.engine.ui.uicommonweb.validation.IValidation; import org.ovirt.engine.ui.uicommonweb.validation.NoTrimmingWhitespacesValidation; import org.ovirt.engine.ui.uicommonweb.validation.NotEmptyValidation; -import org.ovirt.engine.ui.uicompat.UIConstants; import org.ovirt.engine.ui.uicompat.ConstantsManager; import org.ovirt.engine.ui.uicompat.Event; import org.ovirt.engine.ui.uicompat.EventArgs; import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs; +import org.ovirt.engine.ui.uicompat.UIConstants; @SuppressWarnings("unused") public abstract class RunOnceModel extends Model @@ -705,7 +705,7 @@ getDisplayConsole_Spice_IsSelected().setEntity(!isVncSelected); } - private void updateIsoList() { + public void updateIsoList() { AsyncDataProvider.getIrsImageList(new AsyncQuery(this, new INewAsyncCallback() { @Override @@ -912,5 +912,6 @@ commandTarget.executeCommand(command); } } + protected abstract void onRunOnce(); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java index 4741f61..19178bf 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java @@ -146,6 +146,10 @@ : Linq.firstOrDefault(images)); } + public void refreshCdImages() { + updateCdImage(); + } + protected void updateCdImage() { StoragePool dataCenter = getModel().getSelectedDataCenter(); -- To view, visit http://gerrit.ovirt.org/16311 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d487dd839efccb69940c7cc6ada68b668f8fa2d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shav...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
