Lior Vernia has uploaded a new change for review. Change subject: webadmin: Allow default profile to turn into ghost entry ......................................................................
webadmin: Allow default profile to turn into ghost entry Previously this was blocked, seemingly because generally ghost toggling events weren't being triggered for the default profile (when it was being update via the network name). This is hopefully fixed by registering for the model event itself. Change-Id: I0330a07a4af5b911aaa5c3214d56ae381771c0cc Bug-Url: https://bugzilla.redhat.com/1064396 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/NetworkProfilesModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/vnicProfile/VnicProfileWidget.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/vnicProfile/VnicProfilesEditor.java 4 files changed, 12 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/26885/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 6d72017..93e327a 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 @@ -151,10 +151,8 @@ publicUse.setEntity(true); setProfiles(new NetworkProfilesModel()); - VnicProfileModel defaultProfile = createDefaultProfile(); List<VnicProfileModel> profiles = new LinkedList<VnicProfileModel>(); - profiles.add(defaultProfile); - getProfiles().setDefaultProfile(defaultProfile); + profiles.add(createDefaultProfile()); getProfiles().setItems(profiles); setQos(new ListModel<NetworkQoS>()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/NetworkProfilesModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/NetworkProfilesModel.java index 60ce706..4bc26b8 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/NetworkProfilesModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/NetworkProfilesModel.java @@ -7,7 +7,6 @@ public class NetworkProfilesModel extends ListModel<VnicProfileModel> { private EntityModel<Guid> dcId = new EntityModel<Guid>(); - private VnicProfileModel defaultProfile; public EntityModel<Guid> getDcId() { return dcId; @@ -18,14 +17,6 @@ profile.initNetworkQoSList(dcId); } getDcId().setEntity(dcId); - } - - public VnicProfileModel getDefaultProfile() { - return defaultProfile; - } - - public void setDefaultProfile(VnicProfileModel defaultProfile) { - this.defaultProfile = defaultProfile; } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/vnicProfile/VnicProfileWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/vnicProfile/VnicProfileWidget.java index c366f06..36e4f19 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/vnicProfile/VnicProfileWidget.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/vnicProfile/VnicProfileWidget.java @@ -10,6 +10,9 @@ import org.ovirt.engine.ui.common.widget.renderer.NullSafeRenderer; import org.ovirt.engine.ui.common.widget.uicommon.popup.AbstractModelBoundPopupWidget; import org.ovirt.engine.ui.uicommonweb.models.profiles.VnicProfileModel; +import org.ovirt.engine.ui.uicompat.Event; +import org.ovirt.engine.ui.uicompat.EventArgs; +import org.ovirt.engine.ui.uicompat.IEventListener; import org.ovirt.engine.ui.webadmin.ApplicationConstants; import org.ovirt.engine.ui.webadmin.ApplicationResources; import org.ovirt.engine.ui.webadmin.ApplicationTemplates; @@ -114,6 +117,12 @@ ValueChangeEvent.fire(VnicProfileWidget.this, model); } }); + model.getName().getEntityChangedEvent().addListener(new IEventListener() { + @Override + public void eventRaised(Event ev, Object sender, EventArgs args) { + ValueChangeEvent.fire(VnicProfileWidget.this, model); + } + }); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/vnicProfile/VnicProfilesEditor.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/vnicProfile/VnicProfilesEditor.java index f4db743..76ab269 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/vnicProfile/VnicProfilesEditor.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/vnicProfile/VnicProfilesEditor.java @@ -20,7 +20,6 @@ } private Guid dcId; - private VnicProfileModel defaultProfile; public VnicProfilesEditor() { initWidget(WidgetUiBinder.uiBinder.createAndBindUi(this)); @@ -28,7 +27,6 @@ @Override public void edit(final NetworkProfilesModel model) { - defaultProfile = model.getDefaultProfile(); super.edit(model); model.getDcId().getEntityChangedEvent().addListener(new IEventListener() { @@ -55,11 +53,8 @@ @Override protected boolean isGhost(VnicProfileModel value) { - if (value != defaultProfile) { - String name = (String) value.getName().getEntity(); - return (name == null || name.isEmpty()); - } - return false; + String name = (String) value.getName().getEntity(); + return (name == null || name.isEmpty()); } @Override -- To view, visit http://gerrit.ovirt.org/26885 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0330a07a4af5b911aaa5c3214d56ae381771c0cc Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
