Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

webadmin: Deprecate export domain for import #640

Merged
merged 1 commit into from
Sep 7, 2022
Merged

webadmin: Deprecate export domain for import #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplatesModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ private void initImportSources() {
validateSource();
clearTemplates();
});
importSources.setSelectedItem(ImportSource.EXPORT_DOMAIN);
importSources.setSelectedItem(ImportSource.OVA);
}

public void init() {
Expand Down
2 changes: 1 addition & 1 deletion .../uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ private void initImportSources() {
clearValidations();
loadProviders();
});
importSources.setSelectedItem(ImportSource.EXPORT_DOMAIN);
importSources.setSelectedItem(ImportSource.OVA);
}

private void validateSource() {
Expand Down
2 changes: 1 addition & 1 deletion ...odules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ ImageStatus___ILLEGAL=Illegal
ImageStatus___LOCKED=Locked
ImageStatus___OK=OK
ImageStatus___Unassigned=Unassigned
ImportSource___EXPORT_DOMAIN=Export Domain
ImportSource___EXPORT_DOMAIN=Export Domain (deprecated)
ImportSource___KVM=KVM (via Libvirt)
ImportSource___OVA=Virtual Appliance (OVA)
ImportSource___VMWARE=VMware
Expand Down
6 changes: 3 additions & 3 deletions ...java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportTemplatesPopupView.ui.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
<d:content>
<b:Container fluid="true">
<b:Row addStyleNames="{style.topElement}">
<e:ListModelListBoxEditor ui:field="dataCentersEditor" label="{constants.dataCenter}" usePatternFly="true" labelColSize="SM_3" widgetColSize="SM_3" />
<e:ListModelListBoxEditor ui:field="dataCentersEditor" label="{constants.dataCenter}" usePatternFly="true" labelColSize="SM_3" widgetColSize="SM_6" />
</b:Row>
<b:Row addStyleNames="{style.headerBottom}">
<b:Column size="SM_6" addStyleNames="{style.nopadding}">
<e:ListModelListBoxEditor ui:field="importSourcesEditor" label="{constants.importSource}" usePatternFly="true" labelColSize="SM_6" widgetColSize="SM_6" />
<b:Column size="SM_12" addStyleNames="{style.nopadding}">
<e:ListModelListBoxEditor ui:field="importSourcesEditor" label="{constants.importSource}" usePatternFly="true" labelColSize="SM_3" widgetColSize="SM_6" />
</b:Column>
</b:Row>
<g:FlowPanel ui:field="exportPanel" visible="false">
Expand Down
32 changes: 17 additions & 15 deletions .../main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.ui.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

.headerBottom {
border-bottom: 1px solid #D1D1D1;
margin-bottom: 5px;
margin-bottom: 15px;
}

.infoIcon {
Expand All @@ -50,11 +50,13 @@
<d:content>
<b:Container fluid="true">
<b:Row addStyleNames="{style.topElement}">
<e:ListModelListBoxEditor ui:field="dataCentersEditor" label="{constants.dataCenter}" usePatternFly="true" labelColSize="SM_3" widgetColSize="SM_3" />
<b:Column size="SM_6" addStyleNames="{style.nopadding}">
<e:ListModelListBoxEditor ui:field="dataCentersEditor" label="{constants.dataCenter}" usePatternFly="true" labelColSize="SM_4" widgetColSize="SM_8" />
</b:Column>
</b:Row>
<b:Row addStyleNames="{style.headerBottom}">
<b:Column size="SM_6" addStyleNames="{style.nopadding}">
<e:ListModelListBoxEditor ui:field="importSourcesEditor" label="{constants.importSource}" usePatternFly="true" labelColSize="SM_6" widgetColSize="SM_6" />
<e:ListModelListBoxEditor ui:field="importSourcesEditor" label="{constants.importSource}" usePatternFly="true" labelColSize="SM_4" widgetColSize="SM_8" />
</b:Column>
<b:Column size="SM_6" addStyleNames="{style.nopadding}">
<e:ListModelListBoxEditor ui:field="vmwareProvidersEditor" label="{constants.externalProviderLabel}" usePatternFly="true" labelColSize="SM_6" widgetColSize="SM_6" />
Expand All @@ -64,13 +66,13 @@
</b:Row>
<g:FlowPanel ui:field="exportPanel" visible="false">
<b:Row>
<ge:StringEntityModelLabelEditor ui:field="exportDomainName" label="{constants.nameLabel}" usePatternFly="true" labelColSize="SM_3" widgetColSize="SM_9" />
<ge:StringEntityModelLabelEditor ui:field="exportDomainName" label="{constants.nameLabel}" usePatternFly="true" labelColSize="SM_2" widgetColSize="SM_10" />
</b:Row>
<b:Row>
<ge:StringEntityModelLabelEditor ui:field="exportDomainPath" label="{constants.pathStorageGeneral}" usePatternFly="true" labelColSize="SM_3" widgetColSize="SM_9" />
<ge:StringEntityModelLabelEditor ui:field="exportDomainPath" label="{constants.pathStorageGeneral}" usePatternFly="true" labelColSize="SM_2" widgetColSize="SM_10" />
</b:Row>
<b:Row>
<ge:StringEntityModelLabelEditor ui:field="exportDomainDescription" label="{constants.descriptionLabel}" usePatternFly="true" labelColSize="SM_3" widgetColSize="SM_9" />
<ge:StringEntityModelLabelEditor ui:field="exportDomainDescription" label="{constants.descriptionLabel}" usePatternFly="true" labelColSize="SM_2" widgetColSize="SM_10" />
</b:Row>
<b:Row>
<b:Column size="SM_12">
Expand Down Expand Up @@ -119,14 +121,14 @@
</g:FlowPanel>
<g:FlowPanel ui:field="ovaPanel" visible="false">
<b:Row>
<e:ListModelListBoxEditor ui:field="hostsEditor" label="{constants.ovaHost}" usePatternFly="true" labelColSize="SM_3" widgetColSize="SM_9" />
<e:ListModelListBoxEditor ui:field="hostsEditor" label="{constants.ovaHost}" usePatternFly="true" labelColSize="SM_2" widgetColSize="SM_10" />
</b:Row>
<b:Row>
<b:Column size="SM_3">
<b:Column size="SM_2">
<g:Label text="{constants.ovaPath}" addStyleNames="{style.floatLeft}" />
<d:InfoIcon ui:field="ovaPathInfoIcon" addStyleNames="{style.infoIcon}" />
</b:Column>
<ge:StringEntityModelTextBoxOnlyEditor ui:field="ovaPathEditor" usePatternFly="true" widgetColSize="SM_9" />
<ge:StringEntityModelTextBoxOnlyEditor ui:field="ovaPathEditor" usePatternFly="true" widgetColSize="SM_10" />
</b:Row>
<b:Row>
<b:Column size="SM_12">
Expand All @@ -136,10 +138,10 @@
</g:FlowPanel>
<g:FlowPanel ui:field="xenPanel" visible="false">
<b:Row>
<w:EntityModelWidgetWithInfo ui:field="xenUriWithInfo" usePatternFly="true" labelColSize="SM_3" widgetColSize="SM_9" />
<w:EntityModelWidgetWithInfo ui:field="xenUriWithInfo" usePatternFly="true" labelColSize="SM_2" widgetColSize="SM_10" />
</b:Row>
<b:Row>
<e:ListModelListBoxEditor ui:field="xenProxyHostsEditor" label="{constants.proxyHost}" usePatternFly="true" labelColSize="SM_3" widgetColSize="SM_9" />
<e:ListModelListBoxEditor ui:field="xenProxyHostsEditor" label="{constants.proxyHost}" usePatternFly="true" labelColSize="SM_2" widgetColSize="SM_10" />
</b:Row>
<b:Row>
<b:Column size="SM_12">
Expand All @@ -149,21 +151,21 @@
</g:FlowPanel>
<g:FlowPanel ui:field="kvmPanel" visible="false">
<b:Row>
<w:EntityModelWidgetWithInfo ui:field="kvmUriWithInfo" usePatternFly="true" labelColSize="SM_3" widgetColSize="SM_9" />
<w:EntityModelWidgetWithInfo ui:field="kvmUriWithInfo" usePatternFly="true" labelColSize="SM_2" widgetColSize="SM_10" />
</b:Row>
<b:Row>
<b:Column size="SM_12">
<ge:EntityModelCheckBoxEditor ui:field="kvmRequiresAuthenticationEditor" label="{constants.requiresAuthenticationProvider}" usePatternFly="true" removeFormGroup="true" />
</b:Column>
</b:Row>
<b:Row>
<ge:StringEntityModelTextBoxEditor ui:field="kvmUsernameEditor" label="{constants.usernameProvider}" usePatternFly="true" labelColSize="SM_3" widgetColSize="SM_9" />
<ge:StringEntityModelTextBoxEditor ui:field="kvmUsernameEditor" label="{constants.usernameProvider}" usePatternFly="true" labelColSize="SM_2" widgetColSize="SM_10" />
</b:Row>
<b:Row>
<ge:StringEntityModelPasswordBoxEditor ui:field="kvmPasswordEditor" label="{constants.passwordProvider}" usePatternFly="true" labelColSize="SM_3" widgetColSize="SM_9" />
<ge:StringEntityModelPasswordBoxEditor ui:field="kvmPasswordEditor" label="{constants.passwordProvider}" usePatternFly="true" labelColSize="SM_2" widgetColSize="SM_10" />
</b:Row>
<b:Row>
<e:ListModelListBoxEditor ui:field="kvmProxyHostsEditor" label="{constants.proxyHost}" usePatternFly="true" labelColSize="SM_3" widgetColSize="SM_9" />
<e:ListModelListBoxEditor ui:field="kvmProxyHostsEditor" label="{constants.proxyHost}" usePatternFly="true" labelColSize="SM_2" widgetColSize="SM_10" />
</b:Row>
<b:Row>
<b:Column size="SM_12">
Expand Down