Merge pull request #32323 from sokumon/extend-notifcation-header

fix: extend_notification_header
This commit is contained in:
Soham Kulkarni 2025-05-12 21:56:39 +05:30 committed by GitHub
commit e351a46012
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 24 additions and 4 deletions

View file

@ -16,7 +16,8 @@
"attachment_link",
"open_reference_document",
"from_user",
"link"
"link",
"email_header"
],
"fields": [
{
@ -98,12 +99,17 @@
"fieldtype": "Data",
"hidden": 1,
"label": "Link"
},
{
"fieldname": "email_header",
"fieldtype": "Data",
"label": "Email Header"
}
],
"hide_toolbar": 1,
"in_create": 1,
"links": [],
"modified": "2024-08-03 09:38:10.497711",
"modified": "2025-05-10 23:58:54.717673",
"modified_by": "Administrator",
"module": "Desk",
"name": "Notification Log",
@ -119,9 +125,10 @@
"share": 1
}
],
"row_format": "Dynamic",
"sort_field": "creation",
"sort_order": "DESC",
"states": [],
"title_field": "subject",
"track_seen": 1
}
}

View file

@ -152,8 +152,16 @@ def get_email_header(doc, language: str | None = None):
"Assignment": _("Assignment Update on {0}", lang=language).format(docname),
"Share": _("New Document Shared {0}", lang=language).format(docname),
}
if not doc.email_header:
doc.email_header = header_map[doc.type or "default"]
return doc.email_header
return header_map[doc.type or "Default"]
def format_email_header(header_map, language, docname):
messages = []
for v in list(header_map.values()):
messages.append(_(v[0], lang=language).format(docname))
return dict(zip(header_map.keys(), messages, strict=True))
@frappe.whitelist()

View file

@ -163,6 +163,11 @@ frappe.ui.form.ScriptManager = class ScriptManager {
handlers.new_style.push(fn);
});
}
if (frappe.ui.form.handlers["*"] && frappe.ui.form.handlers["*"][event_name]) {
$.each(frappe.ui.form.handlers["*"][event_name], function (i, fn) {
handlers.new_style.push(fn);
});
}
if (this.frm.cscript && this.frm.cscript[event_name]) {
handlers.old_style.push(event_name);
}