Martin Mucha has uploaded a new change for review. Change subject: webadmin: fix closing dialog and missing titles ......................................................................
webadmin: fix closing dialog and missing titles There must have been some infra change causing all this. Component configuring MAC pools is reused and opened in two parts of gui. At one spot it's opened via setWindow method and in another via setConfirmWindow, which is problematic since closing of such window is done inside of SharedMacPoolModel, which does not know how it was displayed. Simplest solution was to pass parameter denoting 'how to close' when cancel is clicked. Also dialog title wasn't set; changing model on which title is set fixed that. Change-Id: If38382bbe1a971f8904bbbb4fbd1db7e1855fef4 Bug-Url: https://bugzilla.redhat.com/1180898 Bug-Url: https://bugzilla.redhat.com/1180901 Signed-off-by: Martin Mucha <mmu...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/NewSharedMacPoolModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/SharedMacPoolListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/SharedMacPoolModel.java 4 files changed, 16 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/36898/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java index 2237320..4057545 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java @@ -392,7 +392,7 @@ } private void addMacPool(final DataCenterModel dcModel) { - SharedMacPoolModel macPoolModel = new NewSharedMacPoolModel(this) { + SharedMacPoolModel macPoolModel = new NewSharedMacPoolModel(this, true) { @Override protected void onActionSucceeded(Guid macPoolId) { MacPool macPool = getEntity(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/NewSharedMacPoolModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/NewSharedMacPoolModel.java index 70f9b7b..95dd004 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/NewSharedMacPoolModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/NewSharedMacPoolModel.java @@ -7,11 +7,11 @@ public class NewSharedMacPoolModel extends SharedMacPoolModel { - public NewSharedMacPoolModel(Model sourceModel) { - super(sourceModel, VdcActionType.AddMacPool); - sourceModel.setTitle(ConstantsManager.getInstance().getConstants().newSharedMacPoolTitle()); - sourceModel.setHashName("new_shared_mac_pool"); //$NON-NLS-1$ - sourceModel.setHelpTag(HelpTag.new_shared_mac_pool); + public NewSharedMacPoolModel(Model sourceModel, boolean closeUsingConfirmWindow) { + super(sourceModel, VdcActionType.AddMacPool, closeUsingConfirmWindow); + setTitle(ConstantsManager.getInstance().getConstants().newSharedMacPoolTitle()); + setHashName("new_shared_mac_pool"); //$NON-NLS-1$ + setHelpTag(HelpTag.new_shared_mac_pool); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/SharedMacPoolListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/SharedMacPoolListModel.java index 6bf48fd..08f7220 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/SharedMacPoolListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/SharedMacPoolListModel.java @@ -88,13 +88,13 @@ } private void newMacPool() { - SharedMacPoolModel model = new NewSharedMacPoolModel(this); + SharedMacPoolModel model = new NewSharedMacPoolModel(this, false); model.setEntity(new MacPool()); setWindow(model); } private void editMacPool() { - SharedMacPoolModel model = new SharedMacPoolModel(this, VdcActionType.UpdateMacPool); + SharedMacPoolModel model = new SharedMacPoolModel(this, VdcActionType.UpdateMacPool, false); model.setTitle(ConstantsManager.getInstance().getConstants().editSharedMacPoolTitle()); model.setHashName("edit_shared_mac_pool"); //$NON-NLS-1$ model.setHelpTag(HelpTag.edit_shared_mac_pool); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/SharedMacPoolModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/SharedMacPoolModel.java index 7f595a1..269268e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/SharedMacPoolModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/macpool/SharedMacPoolModel.java @@ -25,6 +25,7 @@ private final EntityModel<String> name = new EntityModel<String>(); private final EntityModel<String> description = new EntityModel<String>(); + private final boolean closeUsingConfirmWindow; public EntityModel<String> getName() { return name; @@ -34,9 +35,10 @@ return description; } - public SharedMacPoolModel(Model sourceModel, VdcActionType actionType) { + public SharedMacPoolModel(Model sourceModel, VdcActionType actionType, boolean closeUsingConfirmWindow) { this.sourceModel = sourceModel; this.actionType = actionType; + this.closeUsingConfirmWindow = closeUsingConfirmWindow; UICommand tempVar = new UICommand("OnSave", this); //$NON-NLS-1$ tempVar.setTitle(ConstantsManager.getInstance().getConstants().ok()); @@ -72,7 +74,11 @@ } protected void cancel() { - sourceModel.setWindow(null); + if (closeUsingConfirmWindow) { + sourceModel.setConfirmWindow(null); + } else { + sourceModel.setWindow(null); + } } private void onSave() { -- To view, visit http://gerrit.ovirt.org/36898 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If38382bbe1a971f8904bbbb4fbd1db7e1855fef4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <mmu...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
