Переглянути джерело

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 sender: Communcation sender (default current user).
:param recipients: Communication recipients as list. :param recipients: Communication recipients as list.
:param communication_medium: Medium of communication (default **Email**). :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_html: HTML Print format to be sent as attachment.
:param print_format: Print Format name of parent document 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. :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: if not sender:
sender = get_formatted_email(frappe.session.user) sender = get_formatted_email(frappe.session.user)


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

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


+ 1
- 0
frappe/public/js/frappe/desk.js Переглянути файл

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


Завантаження…
Відмінити
Зберегти