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

fix: cannot read property doc of undefined (#12891)

Browse source
This commit is contained in:
Sagar Vora 2021-04-18 12:38:19 +05:30 • committed by GitHub
parent 2bf968e753
commit 33b12d91f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/core/doctype/communication/communication_list.js
View file

@ -20,6 +20,6 @@ frappe.listview_settings['Communication'] = {
},
primary_action: function() {
new frappe.views.CommunicationComposer({ doc: {} });
new frappe.views.CommunicationComposer();
}
};

13
frappe/public/js/frappe/views/communication.js
View file

@ -7,6 +7,10 @@ const separator_element = '<div>---</div>';
frappe.views.CommunicationComposer = class {
constructor(opts) {
$.extend(this, opts);
if (!this.doc) {
this.doc = this.frm && this.frm.doc || {};
}
this.make();
}
@ -269,7 +273,7 @@ frappe.views.CommunicationComposer = class {
method: 'frappe.email.doctype.email_template.email_template.get_email_template',
args: {
template_name: email_template,
doc: me.frm.doc,
doc: me.doc,
_lang: me.dialog.get_value("language_sel")
},
callback(r) {
@ -382,11 +386,10 @@ frappe.views.CommunicationComposer = class {
}
setup_print_language() {
const doc = this.frm && this.frm.doc;
const fields = this.dialog.fields_dict;
//Load default print language from doctype
this.lang_code = doc.language
this.lang_code = this.doc.language
|| this.get_print_format().default_print_language
|| frappe.boot.lang;
@ -612,7 +615,7 @@ frappe.views.CommunicationComposer = class {
send_email(btn, form_values, selected_attachments, print_html, print_format) {
const me = this;
me.dialog.hide();
this.dialog.hide();
if (!form_values.recipients) {
frappe.msgprint(__("Enter Email Recipient(s)"));
@ -625,7 +628,7 @@ frappe.views.CommunicationComposer = class {
}
if (this.frm && !frappe.model.can_email(me.doc.doctype, this.frm)) {
if (this.frm && !frappe.model.can_email(this.doc.doctype, this.frm)) {
frappe.msgprint(__("You are not allowed to send emails related to this document"));
return;
}

4
frappe/public/js/frappe/views/inbox/inbox_view.js
View file

@ -204,9 +204,7 @@ frappe.views.InboxView = class InboxView extends frappe.views.ListView {
};
frappe.new_doc('Email Account');
} else {
new frappe.views.CommunicationComposer({
doc: {}
});
new frappe.views.CommunicationComposer();
}
}
};