From 6caf34822f11cfd47e710fd3a25dae66b208800a Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Fri, 1 Feb 2019 17:23:54 +0530 Subject: [PATCH] added template and removed message --- .../personal_data_download_request.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/frappe/website/doctype/personal_data_download_request/personal_data_download_request.py b/frappe/website/doctype/personal_data_download_request/personal_data_download_request.py index bb740fa477..1983345a32 100644 --- a/frappe/website/doctype/personal_data_download_request/personal_data_download_request.py +++ b/frappe/website/doctype/personal_data_download_request/personal_data_download_request.py @@ -21,17 +21,18 @@ class PersonalDataDownloadRequest(Document): user_name = self.user_name.replace(' ','-') f = frappe.get_doc({ 'doctype': 'File', - 'file_name': 'Personal-Data-'+user_name+'-'+self.name+'.json', + 'file_name': 'Personal-Data-'+user_name+'-'+self.name+'.txt', "attached_to_doctype": 'Personal Data Download Request', - "attached_to_name": self, + "attached_to_name": self.name, 'content': str(personal_data), 'is_private': True }) f.save() frappe.sendmail(recipients= self.user, - subject=_("ERPNext: User Data"), - message= _("Your data is ready, Click here to download your data"), - header=[_("ERPNext: User Data"), "green"]) + subject=_("ERPNext: Download Your Data"), + template="download_data", + args={'user':self.user,'user_name':self.user_name,'link':"".join(f.file_url)}, + header=[_("ERPNext: Download Your Data"), "green"]) def get_user_data(user): """ returns user data not linked to User doctype """ @@ -40,7 +41,7 @@ def get_user_data(user): for hook in hooks: d = [] for email_field in hook.get('email_field'): - d += frappe.get_all(hook.get('doctype'), {email_field: user},["*"]) + d += frappe.get_all(hook.get('doctype'), {email_field: user}, ["*"]) if d: data.update({ hook.get('doctype'):d }) return data \ No newline at end of file