Arik Hadas has uploaded a new change for review.
Change subject: webadmin:
......................................................................
webadmin:
Change-Id: I0c22c5b35f3c1d2c144102163c182f46235b0aa9
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.ui.xml
5 files changed, 93 insertions(+), 22 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/16/42016/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java
index 55fd89b..04c3bf6 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java
@@ -450,11 +450,6 @@
}
@Override
- protected Object provideDetailModelEntity(Object selectedItem) {
- return selectedItem;
- }
-
- @Override
protected void activeDetailModelChanged() {
super.activeDetailModelChanged();
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
index f71756a..f7a945e 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
@@ -264,4 +264,9 @@
AsyncDataProvider.getInstance().getMaxVmNameLengthWin()
: AsyncDataProvider.getInstance().getMaxVmNameLengthNonWin();
}
+
+ @Override
+ protected Object provideDetailModelEntity(Object selectedItem) {
+ return selectedItem;
+ }
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java
index 1c4dc9a..1a5e0b2 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java
@@ -11,6 +11,7 @@
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.businessentities.StoragePoolStatus;
+import org.ovirt.engine.core.common.businessentities.StorageServerConnections;
import org.ovirt.engine.core.common.businessentities.VM;
import
org.ovirt.engine.core.common.businessentities.comparators.NameableComparator;
import
org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters;
@@ -27,6 +28,7 @@
import org.ovirt.engine.ui.uicommonweb.models.EntityModel;
import org.ovirt.engine.ui.uicommonweb.models.ListModel;
import org.ovirt.engine.ui.uicommonweb.models.ListWithSimpleDetailsModel;
+import org.ovirt.engine.ui.uicommonweb.models.storage.StorageGeneralModel;
import org.ovirt.engine.ui.uicompat.ConstantsManager;
import com.google.inject.Inject;
@@ -40,6 +42,7 @@
private ListModel<EntityModel<VM>> importedVmModels;
private StorageDomain exportDomain;
+ private String exportPath;
private UICommand addImportCommand = new UICommand(null, this);
private UICommand cancelImportCommand = new UICommand(null, this);
@@ -158,11 +161,27 @@
for (StorageDomain storageDomain : storageDomains) {
if (storageDomain.getStorageDomainType() ==
StorageDomainType.ImportExport
&& storageDomain.getStatus() ==
StorageDomainStatus.Active) {
- return (exportDomain = storageDomain).getId();
+ exportDomain = storageDomain;
+ queryForExportPath();
+ return exportDomain.getId();
}
}
return null;
+ }
+
+ private void queryForExportPath() {
+ AsyncQuery _asyncQuery = new AsyncQuery();
+ _asyncQuery.setModel(this);
+ _asyncQuery.asyncCallback = new INewAsyncCallback() {
+ @Override
+ public void onSuccess(Object model, Object ReturnValue)
+ {
+ StorageServerConnections connection =
(StorageServerConnections) ReturnValue;
+ setExportPath(connection == null ? null :
connection.getconnection());
+ }
+ };
+ AsyncDataProvider.getInstance().getStorageConnectionById(_asyncQuery,
exportDomain.getStorage(), true);
}
private void initDataCenters() {
@@ -285,4 +304,20 @@
getImportSourceValid().setMessage(msg);
getImportSourceValid().setEntity(false);
}
+
+ public String getExportPath() {
+ return exportPath;
+ }
+
+ public void setExportPath(String exportPath) {
+ this.exportPath = exportPath;
+ }
+
+ public String getExportName() {
+ return exportDomain.getName();
+ }
+
+ public String getExportDescription() {
+ return exportDomain.getDescription();
+ }
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.java
index 808aed2..6fe7f9d 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.java
@@ -8,6 +8,10 @@
import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel;
import org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable;
import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxEditor;
+import org.ovirt.engine.ui.common.widget.form.FormBuilder;
+import org.ovirt.engine.ui.common.widget.form.FormItem;
+import org.ovirt.engine.ui.common.widget.form.GeneralFormPanel;
+import org.ovirt.engine.ui.common.widget.label.TextBoxLabel;
import org.ovirt.engine.ui.common.widget.renderer.EnumRenderer;
import org.ovirt.engine.ui.common.widget.renderer.NameRenderer;
import org.ovirt.engine.ui.common.widget.renderer.NullSafeRenderer;
@@ -72,6 +76,10 @@
@Ignore
EntityModelCellTable<ListModel<EntityModel<VM>>> importedVms;
+ @UiField(provided = true)
+ @WithElementId
+ GeneralFormPanel exportDetailsPanel;
+
@UiField
@Ignore
public ButtonBase refreshButton;
@@ -80,6 +88,16 @@
@Ignore
Label message;
+ @Path("exportPath")
+ TextBoxLabel exportDomainPath = new TextBoxLabel();
+
+ @Path("exportName")
+ TextBoxLabel exportDomainName = new TextBoxLabel();
+
+ @Path("exportDescription")
+ TextBoxLabel exportDomainDescription = new TextBoxLabel();
+
+ private FormBuilder formBuilder;
private ImportVmsModel model;
private final static ApplicationTemplates templates =
AssetProvider.getTemplates();
@@ -112,6 +130,7 @@
constants.externalVms(),
constants.importedVms());
initWidget(ViewUiBinder.uiBinder.createAndBindUi(this));
+ initExportDomainDetailsPanel();
initEntityModelCellTables();
DataCentersEditor.setLabel(constants.dataCenter());
DataCentersEditor.addWrapperStyleName(style.providersStyle());
@@ -120,6 +139,15 @@
driver.initialize(this);
}
+ private void initExportDomainDetailsPanel() {
+ exportDetailsPanel = new GeneralFormPanel();
+ formBuilder = new FormBuilder(exportDetailsPanel, 1, 3);
+ formBuilder.setRelativeColumnWidth(0, 4);
+ formBuilder.addFormItem(new FormItem(constants.nameLabel(),
exportDomainName, 0, 0));
+ formBuilder.addFormItem(new FormItem(constants.descriptionLabel(),
exportDomainDescription, 1, 0));
+ formBuilder.addFormItem(new FormItem(constants.pathStorageGeneral(),
exportDomainPath, 2, 0));
+ }
+
void initEntityModelCellTables() {
externalVms.addColumn(new AbstractTextColumn<EntityModel<VM>>() {
@Override
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.ui.xml
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.ui.xml
index 04d145d..2dc6105 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.ui.xml
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.ui.xml
@@ -2,7 +2,9 @@
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent";>
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:g="urn:import:com.google.gwt.user.client.ui"
xmlns:d="urn:import:org.ovirt.engine.ui.common.widget.dialog"
- xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor"
xmlns:w="urn:import:org.ovirt.engine.ui.common.widget">
+ xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor"
xmlns:w="urn:import:org.ovirt.engine.ui.common.widget"
+ xmlns:f="urn:import:org.ovirt.engine.ui.common.widget.form"
+ xmlns:ge="urn:import:org.ovirt.engine.ui.common.widget.editor.generic">
<ui:with field='resources'
type='org.ovirt.engine.ui.common.CommonApplicationResources' />
@@ -12,7 +14,8 @@
}
.section {
- margin-bottom: 5px;
+ margin-top: 5px;
+ margin-bottom: 10px;
}
.refreshButton {
@@ -37,21 +40,26 @@
}
</ui:style>
- <d:SimpleDialogPanel ui:field="mainPanel" width="800px" height="470px">
+ <d:SimpleDialogPanel ui:field="mainPanel" width="800px" height="625px">
<d:content>
- <g:VerticalPanel>
- <g:FlowPanel addStyleNames="{style.section}">
- <e:ListModelListBoxEditor
ui:field="DataCentersEditor" />
- <g:HorizontalPanel>
- <e:ListModelListBoxEditor
ui:field="importSourcesEditor" />
- <g:PushButton
ui:field="refreshButton" addStyleNames="{style.refreshButton}
avmpw_refreshButton_pfly_fix">
- <g:upFace image='{resources.refreshButtonImage}'
/>
- </g:PushButton>
- </g:HorizontalPanel>
- </g:FlowPanel>
- <g:Label ui:field="message"
addStyleNames="{style.labelStyle}" />
- <w:VerticalSplitTable ui:field="splitTable" />
- </g:VerticalPanel>
+ <g:HorizontalPanel>
+ <g:VerticalPanel width="100%">
+ <g:FlowPanel
addStyleNames="{style.section}">
+ <e:ListModelListBoxEditor
ui:field="DataCentersEditor" />
+ <e:ListModelListBoxEditor
ui:field="importSourcesEditor" />
+ </g:FlowPanel>
+
+ <FlowPanel ui:field="exportPanel"
addStyleNames="{style.section}">
+ <f:GeneralFormPanel
ui:field="exportDetailsPanel"/>
+ <g:PushButton
ui:field="refreshButton" addStyleNames="{style.refreshButton}
avmpw_refreshButton_pfly_fix">
+ <g:upFace
image='{resources.refreshButtonImage}' />
+ </g:PushButton>
+ </FlowPanel>
+
+ <g:Label ui:field="message"
addStyleNames="{style.labelStyle}" />
+ <w:VerticalSplitTable
ui:field="splitTable" />
+ </g:VerticalPanel>
+ </g:HorizontalPanel>
</d:content>
</d:SimpleDialogPanel>
--
To view, visit https://gerrit.ovirt.org/42016
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c22c5b35f3c1d2c144102163c182f46235b0aa9
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
