Alona Kaplan has uploaded a new change for review.
Change subject: webadmin: remove public use checkbox from new network dialog
......................................................................
webadmin: remove public use checkbox from new network dialog
Public use check box was moved to profiles dialog in a previous patch.
This patch removes the checkbox from the new network dialog.
Change-Id: I464d1b2438c5fe53a5c5519334f37d2b2efb13d8
Signed-off-by: Alona Kaplan <alkap...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/NewNetworkPopupView.java
4 files changed, 0 insertions(+), 30 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/17558/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java
index 858b561..024ed38 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java
@@ -48,7 +48,6 @@
private EntityModel privateHasMtu;
private EntityModel privateMtu;
private EntityModel privateIsVmNetwork;
- private EntityModel publicUse;
private boolean isSupportBridgesReportByVDSM = false;
private boolean mtuOverrideSupported = false;
private ListModel privateDataCenters;
@@ -119,7 +118,6 @@
setIsVmNetwork(isVmNetwork);
EntityModel publicUse = new EntityModel();
publicUse.setEntity(true);
- setPublicUse(publicUse);
setProfiles(new ListModel());
@@ -239,14 +237,6 @@
public void setIsVmNetwork(EntityModel value)
{
privateIsVmNetwork = value;
- }
-
- public EntityModel getPublicUse() {
- return publicUse;
- }
-
- public void setPublicUse(EntityModel publicUse) {
- this.publicUse = publicUse;
}
public boolean isSupportBridgesReportByVDSM() {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java
index 7502c1a..e89196d 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java
@@ -124,10 +124,6 @@
@UiField
public WidgetStyle style;
- @UiField(provided = true)
- @Path(value = "publicUse.entity")
- public final EntityModelCheckBoxEditor publicUseEditor;
-
@UiField
@Path(value = "networkLabel.entity")
public EntityModelTextBoxEditor networkLabel;
@@ -173,7 +169,6 @@
isVmNetworkEditor = new EntityModelCheckBoxEditor(Align.RIGHT);
vlanTagging = new EntityModelCheckBoxEditor(Align.RIGHT);
hasMtuEditor = new EntityModelCheckBoxEditor(Align.RIGHT);
- publicUseEditor = new EntityModelCheckBoxEditor(Align.RIGHT);
this.clustersTable = new
EntityModelCellTable<ListModel>(SelectionMode.NONE, true);
initWidget(ViewUiBinder.uiBinder.createAndBindUi(this));
initEntityModelCellTable(constants, templates);
@@ -198,7 +193,6 @@
isVmNetworkEditor.setLabel(constants.vmNetworkLabel());
vlanTagging.setLabel(constants.enableVlanTagLabel());
hasMtuEditor.setLabel(constants.overrideMtuLabel());
- publicUseEditor.setLabel(constants.networkPublicUseLabel());
profilesLabel.setText(constants.profilesLabel());
}
@@ -212,8 +206,6 @@
vlanTagging.asCheckBox().addStyleName(style.checkBox());
hasMtuEditor.addContentWidgetStyleName(style.checkBox());
hasMtuEditor.asCheckBox().addStyleName(style.checkBox());
- publicUseEditor.addContentWidgetStyleName(style.publicUseEditor());
- publicUseEditor.asCheckBox().addStyleName(style.checkBox());
}
@Override
@@ -312,7 +304,6 @@
@Override
public void updateVisibility() {
messageLabel.setVisible(false);
- publicUseEditor.setVisible(false);
}
interface WidgetStyle extends CssResource {
@@ -321,8 +312,6 @@
String vlanEditor();
String checkBox();
-
- String publicUseEditor();
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml
index a3d4b1d..9cfd64e 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml
@@ -55,11 +55,6 @@
padding: 5px;
}
- .publicUseEditor {
- padding: 0px;
- width: 100%;
- }
-
</ui:style>
<d:SimpleDialogPanel ui:field="mainPanel" width="670px" height="550px">
@@ -93,9 +88,6 @@
<e:EntityModelCheckBoxEditor ui:field="hasMtuEditor"/>
<e:EntityModelTextBoxOnlyEditor ui:field="mtuEditor" />
</g:HorizontalPanel>
- </g:FlowPanel>
- <g:FlowPanel
addStyleNames="{style.sectionStyle}">
-
<e:EntityModelCheckBoxEditor ui:field="publicUseEditor"/>
</g:FlowPanel>
</g:FlowPanel>
</t:content>
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/NewNetworkPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/NewNetworkPopupView.java
index 91d7a42..9ab5ad7 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/NewNetworkPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/NewNetworkPopupView.java
@@ -31,7 +31,6 @@
public void updateVisibility() {
super.updateVisibility();
messageLabel.setVisible(false);
- publicUseEditor.setVisible(true);
}
@Override
--
To view, visit http://gerrit.ovirt.org/17558
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I464d1b2438c5fe53a5c5519334f37d2b2efb13d8
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alona Kaplan <alkap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
