vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(minor): frappe.toast alist from frappe.show_alert, and added toasts to website.js, plus show full processlist

Browse source
This commit is contained in:
Rushabh Mehta 2021-09-10 11:27:36 +05:30
parent c280671a7a
commit 22f143898b
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/desk/doctype/system_console/system_console.py
View file

@ -38,4 +38,4 @@ def execute_code(doc):
@frappe.whitelist()
def show_processlist():
frappe.only_for('System Manager')
return frappe.db.sql('show processlist', as_dict=1)
return frappe.db.sql('show full processlist', as_dict=1)

4
frappe/public/js/frappe/ui/messages.js
View file

@ -140,7 +140,7 @@ frappe.msgprint = function(msg, title, is_minimizable) {
return;
}
if(data.alert) {
if(data.alert || data.toast) {
frappe.show_alert(data);
return;
}
@ -361,7 +361,7 @@ frappe.hide_progress = function() {
}
// Floating Message
frappe.show_alert = function(message, seconds=7, actions={}) {
frappe.show_alert = frappe.toast = function(message, seconds=7, actions={}) {
let indicator_icon_map = {
'orange': "solid-warning",
'yellow': "solid-warning",

1
frappe/public/scss/website/index.scss
View file

@ -8,6 +8,7 @@
@import "../common/flex";
@import "../common/buttons";
@import "../common/modal";
@import "../desk/toast";
@import "../common/indicator";
@import "../common/controls";
@import "../common/awesomeplete";