Преглед изворни кода

fix: continue authentication

version-14
Rushabh Mehta пре 6 година
родитељ
комит
b982f83586
2 измењених фајлова са 5 додато и 1 уклоњено
  1. +4
    -1
      frappe/core/doctype/communication/email.py
  2. +1
    -0
      frappe/public/js/frappe/desk.js

+ 4
- 1
frappe/core/doctype/communication/email.py Прегледај датотеку

@@ -33,7 +33,7 @@ def make(doctype=None, name=None, content=None, subject=None, sent_or_received =
:param sender: Communcation sender (default current user).
:param recipients: Communication recipients as list.
:param communication_medium: Medium of communication (default **Email**).
:param send_mail: Send via email (default **False**).
:param send_email: Send via email (default **False**).
:param print_html: HTML Print format to be sent as attachment.
:param print_format: Print Format name of parent document to be sent as attachment.
:param attachments: List of attachments as list of files or JSON string.
@@ -50,6 +50,9 @@ def make(doctype=None, name=None, content=None, subject=None, sent_or_received =
if not sender:
sender = get_formatted_email(frappe.session.user)

if isinstance(recipients, list):
recipients = ', '.join(recipients)

comm = frappe.get_doc({
"doctype":"Communication",
"subject": subject,


+ 1
- 0
frappe/public/js/frappe/desk.js Прегледај датотеку

@@ -397,6 +397,7 @@ frappe.Application = Class.extend({
}
});
dialog.set_primary_action(__('Login'), () => {
me.dialog.set_message(__('Authenticating...'));
frappe.call({
method: 'login',
args: {


Loading…
Откажи
Сачувај