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

fix: spec preview fields statically on the frontend

Browse source
This commit is contained in:
David 2024-08-09 13:49:09 +02:00
parent 9ed2271d12
commit ac0e46669d
No known key found for this signature in database
GPG key ID: AB15A6AF1101390D
4 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
frappe/email/doctype/notification/notification.js
View file

@ -164,7 +164,6 @@ frappe.ui.form.on("Notification", {
},
};
});
frm.preview_fields = frm.doc.__onload.preview_fields;
},
refresh: function (frm) {
frappe.notification.setup_fieldname_select(frm);
@ -185,7 +184,15 @@ frappe.ui.form.on("Notification", {
const args = {
doc: frm.doc,
doctype: frm.doc.document_type,
preview_fields: frm.preview_fields,
preview_fields: [
{
label: __("Meets Condition?"),
fieldtype: "Data",
method: "preview_meets_condition",
},
{ label: __("Subject"), fieldtype: "Data", method: "preview_subject" },
{ label: __("Message"), fieldtype: "Code", method: "preview_message" },
],
};
let dialog = new frappe.views.RenderPreviewer(args);
return dialog;

8
frappe/email/doctype/notification/notification.py
View file

@ -73,14 +73,6 @@ class Notification(Document):
"""load message"""
if self.is_standard:
self.message = self.get_template()
self.set_onload(
"preview_fields",
[
{"label": _("Meets Condition?"), "fieldtype": "Data", "method": "preview_meets_condition"},
{"label": _("Subject"), "fieldtype": "Data", "method": "preview_subject"},
{"label": _("Message"), "fieldtype": "Code", "method": "preview_message"},
],
)
def autoname(self):
if not self.name:

16
frappe/integrations/doctype/webhook/webhook.js
View file

@ -79,9 +79,6 @@ frappe.webhook = {
};
frappe.ui.form.on("Webhook", {
onload: (frm) => {
frm.preview_fields = frm.doc.__onload.preview_fields;
},
refresh: (frm) => {
frappe.webhook.set_fieldname_select(frm);
frm.set_query(
@ -94,7 +91,18 @@ frappe.ui.form.on("Webhook", {
const args = {
doc: frm.doc,
doctype: frm.doc.webhook_doctype,
preview_fields: frm.preview_fields,
preview_fields: [
{
label: __("Meets Condition?"),
fieldtype: "Data",
method: "preview_meets_condition",
},
{
label: __("Request Body"),
fieldtype: "Code",
method: "preview_request_body",
},
],
};
let dialog = new frappe.views.RenderPreviewer(args);
return dialog;

9
frappe/integrations/doctype/webhook/webhook.py
View file

@ -56,15 +56,6 @@ class Webhook(Document):
webhook_secret: DF.Password | None
# end: auto-generated types
def onload(self):
self.set_onload(
"preview_fields",
[
{"label": _("Meets Condition?"), "fieldtype": "Data", "method": "preview_meets_condition"},
{"label": _("Request Body"), "fieldtype": "Code", "method": "preview_request_body"},
],
)
def validate(self):
self.validate_docevent()
self.validate_condition()