Mike Kolesnik has uploaded a new change for review. Change subject: webadmin: Added external ID to general sub tab ......................................................................
webadmin: Added external ID to general sub tab Added external ID for external networks to the general sub tab. Change-Id: I434a25f0f3c33f40d88d0054921abca2f6cf415a Bug-Url: https://bugzilla.redhat.com/1067469 Signed-off-by: Mike Kolesnik <mkole...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java 2 files changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/25327/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java index 096149a..1f02bf6 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java @@ -21,6 +21,7 @@ private Integer mtu; private String description; private Guid id; + private String externalId; public NetworkGeneralModel() { setTitle(ConstantsManager.getInstance().getConstants().generalTitle()); @@ -72,6 +73,12 @@ setMtu(null); } else { setMtu(extendedNetwork.getMtu()); + } + + if (extendedNetwork.isExternal()) { + setExternalId(extendedNetwork.getProvidedBy().getExternalId()); + } else { + setExternalId(null); } } @@ -155,4 +162,16 @@ onPropertyChanged(new PropertyChangedEventArgs("Id")); //$NON-NLS-1$ } } + + public String getExternalId() { + return externalId; + } + + public void setExternalId(String value) { + if (!ObjectUtils.objectsEqual(externalId, value)) + { + externalId = value; + onPropertyChanged(new PropertyChangedEventArgs("External Id")); //$NON-NLS-1$ + } + } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java index b198d8d..68898f5 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java @@ -42,6 +42,7 @@ TextBoxLabel role = new TextBoxLabel(); ValueLabel<Integer> vlan = new ValueLabel<Integer>(new EmptyValueRenderer<Integer>(constants.noneVlan())); ValueLabel<Integer> mtu = new ValueLabel<Integer>(new EmptyValueRenderer<Integer>(constants.defaultMtu())); + TextBoxLabel externalId = new TextBoxLabel(); @UiField(provided = true) GeneralFormPanel formPanel; @@ -61,7 +62,7 @@ driver.initialize(this); // Build a form using the FormBuilder - formBuilder = new FormBuilder(formPanel, 2, 3); + formBuilder = new FormBuilder(formPanel, 2, 4); formBuilder.addFormItem(new FormItem(constants.nameNetwork(), name, 0, 0)); formBuilder.addFormItem(new FormItem(constants.idNetwork(), id, 1, 0)); @@ -70,6 +71,13 @@ formBuilder.addFormItem(new FormItem(constants.roleNetwork(), role, 0, 1)); formBuilder.addFormItem(new FormItem(constants.vlanNetwork(), vlan, 1, 1)); formBuilder.addFormItem(new FormItem(constants.mtuNetwork(), mtu, 2, 1)); + + formBuilder.addFormItem(new FormItem(constants.externalIdProviderNetwork(), externalId, 3, 0) { + @Override + public boolean getIsAvailable() { + return getDetailModel().getExternalId() != null; + } + }); } @Override -- To view, visit http://gerrit.ovirt.org/25327 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I434a25f0f3c33f40d88d0054921abca2f6cf415a 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
