From 41a7d0bf472b21018715eedf0b4c56ccbeace1f1 Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Mon, 20 Oct 2014 18:39:30 +0200 Subject: [PATCH] webui: do not show closed dialog Fixes issues when dialog is not removed from `IPA.opened_dialogs` registry when dialog.close() is called while the dialog is not shown, i.e., while other dialog is shown. Without it, the dialog is could be incorrectly displayed. New dialog's property `opened` handles whether dialog is intended to be opened. How to test: Add new host with IP address outside of managed reverse zones to get error 4304. https://fedorahosted.org/freeipa/ticket/4656 Reviewed-By: Endi Sukma Dewata --- install/ui/src/freeipa/dialog.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/install/ui/src/freeipa/dialog.js b/install/ui/src/freeipa/dialog.js index c277518ac..6cac66794 100644 --- a/install/ui/src/freeipa/dialog.js +++ b/install/ui/src/freeipa/dialog.js @@ -238,6 +238,16 @@ IPA.dialog = function(spec) { /** @property {boolean} Dialog is shown */ that.is_shown = false; + /** + * Whether dialog should be opened. + * + * The actual display state is reflected in `is_shown` property. Dialog can + * be `opened` and not `is_shown` at the same time, eg., when other dialog + * is displayed. Opposite is invalid state. + * @property {boolean} + */ + that.opened = false; + /** * Close dialog on Escape key press * @property {boolean} close_on_escape=true @@ -556,6 +566,7 @@ IPA.dialog = function(spec) { that.register_listeners(); + this.opened = true; this.emit('open', { source: that }); topic.publish('dialog.open', { source: that }); @@ -571,6 +582,7 @@ IPA.dialog = function(spec) { * @param {Function} clb Show callback, called when showing is complete. */ that.show = function(clb) { + if (!this.opened) return; that.is_shown = true; this.dom_node.one('shown.bs.modal', clb); @@ -648,6 +660,12 @@ IPA.dialog = function(spec) { that.close = function() { that.remove_listeners(); + this.opened = false; + + if (!this.is_shown) { + that.emit('closed', { source: that }); + topic.publish('dialog.closed', { source: that }); + } if (!that.dom_node) return;