From f435aafb9215bc26de9e31fa918aea53bc174bff Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sun, 12 Jun 2016 11:16:06 +0530 Subject: [PATCH] [minor] msgprint as alert --- frappe/__init__.py | 5 ++++- frappe/public/js/frappe/ui/messages.js | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index f024e4f7e7..0a4e86f42a 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -242,7 +242,7 @@ def log(msg): from utils import cstr debug_log.append(cstr(msg)) -def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None): +def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None, alert=False): """Print a message to the user (via HTTP response). Messages are sent in the `__server_messages` property in the response JSON and shown in a pop-up / modal. @@ -285,6 +285,9 @@ def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None) if indicator: out.indicator = indicator + if alert: + out.alert = 1 + message_log.append(json.dumps(out)) _raise_exception() diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js index d9e6970e4e..3e07fae8a0 100644 --- a/frappe/public/js/frappe/ui/messages.js +++ b/frappe/public/js/frappe/ui/messages.js @@ -98,6 +98,11 @@ frappe.msgprint = function(msg, title) { return; } + if(data.alert) { + frappe.show_alert(data.message); + return; + } + if(!msg_dialog) { msg_dialog = new frappe.ui.Dialog({ title: __("Message"),