Mike Kolesnik has uploaded a new change for review. Change subject: webadmin: Remove API version field for Neutron ......................................................................
webadmin: Remove API version field for Neutron Only API version 2.0 is curently supported, and since the user has a prefilled value in the URL field suggesting him the correct server URL to put, there is no need for him to be able to "select" the version. In the future should any other API version be available/supported, it should be solved in an appropriate manner (i.e. auto negotiate the version). Change-Id: Ic264c97b4acb82ffee298cee3f89340cda18ddc3 Bug-Url: https://bugzilla.redhat.com/987917 Signed-off-by: Mike Kolesnik <mkole...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.ui.xml 3 files changed, 0 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/24991/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java index 5c9a993..c079d99 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java @@ -53,7 +53,6 @@ private EntityModel name = new EntityModel(); private EntityModel description = new EntityModel(); private EntityModel url = new EntityModel(); - private ListModel apiVersion = new ListModel(); private EntityModel requiresAuthentication = new EntityModel(); private EntityModel username = new EntityModel(); private EntityModel password = new EntityModel(); @@ -86,10 +85,6 @@ public EntityModel getUrl() { return url; - } - - public ListModel getApiVersion() { - return apiVersion; } public EntityModel getRequiresAuthentication() { @@ -196,7 +191,6 @@ } boolean isNeutron = isTypeOpenStackNetwork(); - getApiVersion().setIsAvailable(isNeutron); getNeutronAgentModel().setIsAvailable(isNeutron); boolean requiresAuth = isTypeRequiresAuthentication(); @@ -206,13 +200,11 @@ }); getNeutronAgentModel().setIsAvailable(false); - getApiVersion().setIsAvailable(false); getTenantName().setIsAvailable(false); List<ProviderType> providerTypes = new ArrayList<ProviderType>(Arrays.asList(ProviderType.values())); Collections.sort(providerTypes, new Linq.ProviderTypeComparator()); getType().setItems(providerTypes); - getApiVersion().setItems(Arrays.asList("v2.0")); //$NON-NLS-1$ UICommand tempVar = new UICommand(CMD_SAVE, this); tempVar.setTitle(ConstantsManager.getInstance().getConstants().ok()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.java index 143fc63..23743cd 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.java @@ -68,11 +68,6 @@ EntityModelTextBoxEditor urlEditor; @UiField - @Path(value = "apiVersion.selectedItem") - @WithElementId - ListModelListBoxEditor<Object> apiVersionEditor; - - @UiField UiCommandButton testButton; @UiField @@ -142,7 +137,6 @@ localize(constants); addContentStyleName(style.contentStyle()); driver.initialize(this); - apiVersionEditor.asListBox().addStyleName(style.apiVersionStyle()); } void localize(ApplicationConstants constants) { @@ -187,7 +181,6 @@ interface Style extends CssResource { String contentStyle(); - String apiVersionStyle(); String testResultImage(); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.ui.xml index 598dbe0..9cf5e83 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.ui.xml @@ -24,11 +24,6 @@ margin-top: 20px; } - .apiVersionStyle { - width: 50px !important; - float: right; - } - .authField { padding-left: 10px; } @@ -69,7 +64,6 @@ <g:FlowPanel> <e:ListModelSuggestBoxEditor ui:field="pluginTypeEditor" /> <e:EntityModelTextBoxEditor ui:field="urlEditor" /> - <e:ListModelListBoxEditor ui:field="apiVersionEditor" /> </g:FlowPanel> <g:FlowPanel addStyleNames="{style.sectionStyle}"> <e:EntityModelCheckBoxEditor ui:field="requiresAuthenticationEditor" /> -- To view, visit http://gerrit.ovirt.org/24991 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic264c97b4acb82ffee298cee3f89340cda18ddc3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
