diff --git a/frappe/website/doctype/personal_data_delete_request/personal_data_delete_request.py b/frappe/website/doctype/personal_data_delete_request/personal_data_delete_request.py index 8d7773d3cf..cd61144225 100644 --- a/frappe/website/doctype/personal_data_delete_request/personal_data_delete_request.py +++ b/frappe/website/doctype/personal_data_delete_request/personal_data_delete_request.py @@ -7,7 +7,6 @@ import frappe from frappe import _ from frappe.model.document import Document from frappe.utils.verified_command import get_signed_params, verify_request -from frappe.website.doctype.personal_data_download_request.personal_data_download_request import get_user_data class PersonalDataDeleteRequest(Document): @@ -32,9 +31,9 @@ class PersonalDataDeleteRequest(Document): for ref_doc in privacy_docs: for email_field in ref_doc.get('email_fields'): frappe.db.sql("""UPDATE `tab{0}` - SET `{1}` = '{2}', {3} - WHERE `{1}` = %s """.format(ref_doc['doctype'], email_field, self.name, - ', '.join(map(lambda u :'`'+ u+'`=\''+str(u)+'\'', ref_doc.get('personal_fields',[])))), (self.email)) + SET `{1}` = '{2}', {3} + WHERE `{1}` = '{4}' """.format(ref_doc['doctype'], email_field, self.name, + ', '.join(map(lambda u :'`'+ u+'`=\''+str(u)+'\'', ref_doc.get('personal_fields',[]))), self.email)) @frappe.whitelist(allow_guest=True) def confirm_deletion(email): diff --git a/frappe/website/doctype/personal_data_delete_request/test_personal_data_delete_request.py b/frappe/website/doctype/personal_data_delete_request/test_personal_data_delete_request.py index 8738259c6f..cbd761261f 100644 --- a/frappe/website/doctype/personal_data_delete_request/test_personal_data_delete_request.py +++ b/frappe/website/doctype/personal_data_delete_request/test_personal_data_delete_request.py @@ -10,9 +10,9 @@ from frappe.website.doctype.personal_data_download_request.test_personal_data_do class TestPersonalDataDeleteRequest(unittest.TestCase): def setUp(self): - create_user_if_not_exists(email='test_privacy@example.com') - frappe.set_user('test_privacy@example.com') - self.delete_request = frappe.get_doc({'doctype':'Personal Data Delete Request', 'email':'test_privacy@example.com'}) + create_user_if_not_exists(email='test_delete@example.com') + frappe.set_user('test_delete@example.com') + self.delete_request = frappe.get_doc({'doctype':'Personal Data Delete Request', 'email':'test_delete@example.com'}) self.delete_request.save(ignore_permissions=True) frappe.set_user('Administrator') 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 91b83cdf22..da1ec1f24b 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 @@ -6,7 +6,6 @@ from __future__ import unicode_literals import frappe from frappe import _ from frappe.model.document import Document -from frappe.desk.form.linked_with import get_linked_doctypes class PersonalDataDownloadRequest(Document): def after_insert(self): @@ -25,7 +24,7 @@ class PersonalDataDownloadRequest(Document): "attached_to_doctype": 'Personal Data Download Request', "attached_to_name": self.name, 'content': str(personal_data), - 'is_private': True + 'is_private': 1 }) f.save() frappe.sendmail(recipients= self.user, diff --git a/frappe/website/doctype/personal_data_download_request/test_personal_data_download_request.py b/frappe/website/doctype/personal_data_download_request/test_personal_data_download_request.py index 47b29d3c6d..75183ff3df 100644 --- a/frappe/website/doctype/personal_data_download_request/test_personal_data_download_request.py +++ b/frappe/website/doctype/personal_data_download_request/test_personal_data_download_request.py @@ -21,14 +21,14 @@ class TestRequestPersonalData(unittest.TestCase): download_request = frappe.get_doc({"doctype": 'Personal Data Download Request', 'user': 'test_privacy@example.com'}) download_request.save(ignore_permissions=True) - f = frappe.get_all('File', + f = frappe.get_all('File', {'attached_to_doctype':'Personal Data Download Request', 'attached_to_name': download_request.name}, ['*']) self.assertEqual(len(f), 1) email_queue = frappe.db.sql("""select * from `tabEmail Queue`""", as_dict=True) self.assertTrue("Subject: ERPNext: Download Your Data" in email_queue[0].message) - + frappe.db.sql("delete from `tabEmail Queue`") def create_user_if_not_exists(email, first_name = None): diff --git a/frappe/website/web_form/request_data/request_data.js b/frappe/website/web_form/request_data/request_data.js index 0de0fbac62..49f34e3e4e 100644 --- a/frappe/website/web_form/request_data/request_data.js +++ b/frappe/website/web_form/request_data/request_data.js @@ -1,7 +1,7 @@ frappe.ready(function() { // bind events here setTimeout(() => { - form = frappe.web_form.field_group.fields_dict; + var form = frappe.web_form.field_group.fields_dict; form.user.set_input(frappe.session.user); }, 1000); -}) \ No newline at end of file +}); \ No newline at end of file diff --git a/frappe/website/web_form/request_data/request_data.py b/frappe/website/web_form/request_data/request_data.py index 2334f8b26d..07616644d3 100644 --- a/frappe/website/web_form/request_data/request_data.py +++ b/frappe/website/web_form/request_data/request_data.py @@ -1,7 +1,4 @@ from __future__ import unicode_literals -import frappe - def get_context(context): - # do your magic here pass