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

[fix] pass session to tasks.sendmail to give access to private files

Browse source
This commit is contained in:
Anand Doshi 2015-12-21 13:15:08 +05:30
parent 820b688c44
commit 5165df0af9
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/core/doctype/communication/communication.py
View file

@ -109,7 +109,7 @@ class Communication(Document):
from frappe.tasks import sendmail
sendmail.delay(frappe.local.site, self.name,
print_html=print_html, print_format=print_format, attachments=attachments,
recipients=recipients, cc=cc, lang=frappe.local.lang)
recipients=recipients, cc=cc, lang=frappe.local.lang, session=frappe.local.session)
def _notify(self, print_html=None, print_format=None, attachments=None,
recipients=None, cc=None):

7
frappe/tasks.py
View file

@ -189,13 +189,18 @@ def run_async_task(self, site=None, user=None, cmd=None, form_dict=None, hijack_
@celery_task()
def sendmail(site, communication_name, print_html=None, print_format=None, attachments=None,
recipients=None, cc=None, lang=None):
recipients=None, cc=None, lang=None, session=None):
try:
frappe.connect(site=site)
if lang:
frappe.local.lang = lang
if session:
# hack to enable access to private files in PDF
session['data'] = frappe._dict(session['data'])
frappe.local.session.update(session)
# upto 3 retries
for i in xrange(3):
try:

2
frappe/utils/pdf.py
View file

@ -39,7 +39,7 @@ def get_pdf(html, options=None):
filedata = fileobj.read()
except IOError, e:
if "ContentNotFoundError" in e.message:
if "ContentNotFoundError" in e.message or "ContentOperationNotPermittedError" in e.message:
# allow pdfs with missing images if file got created
if os.path.exists(fname):
with open(fname, "rb") as fileobj: