From c4e1ba8bbf508bcfe34defe740d0be9146f5dac1 Mon Sep 17 00:00:00 2001 From: Achilles Rasquinha Date: Mon, 18 Dec 2017 15:01:36 +0530 Subject: [PATCH] Fixed multiple dialog render (#4642) --- frappe/public/js/frappe/ui/dialog.js | 2 ++ frappe/public/js/frappe/ui/messages.js | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js index 7de3024966..a3ebf22712 100644 --- a/frappe/public/js/frappe/ui/dialog.js +++ b/frappe/public/js/frappe/ui/dialog.js @@ -103,9 +103,11 @@ frappe.ui.Dialog = frappe.ui.FieldGroup.extend({ // show it this.$wrapper.modal("show"); this.primary_action_fulfilled = false; + this.is_visible = true; }, hide: function(from_event) { this.$wrapper.modal("hide"); + this.is_visible = false; }, get_close_btn: function() { return this.$wrapper.find(".btn-modal-close"); diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js index df64bc77f4..f786d76d7c 100644 --- a/frappe/public/js/frappe/ui/messages.js +++ b/frappe/public/js/frappe/ui/messages.js @@ -235,8 +235,7 @@ frappe.verify_password = function(callback) { } frappe.show_progress = function(title, count, total=100, description) { - if(frappe.cur_progress && frappe.cur_progress.title === title - && frappe.cur_progress.$wrapper.is(":visible")) { + if(frappe.cur_progress && frappe.cur_progress.title === title && frappe.cur_progress.is_visible) { var dialog = frappe.cur_progress; } else { var dialog = new frappe.ui.Dialog({