From 716c045d924c73634fc64be838faea7b5206abef Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 4 Nov 2016 18:41:43 +0530 Subject: [PATCH] [fix] web form for guest --- frappe/email/queue.py | 4 ++-- frappe/website/doctype/web_form/web_form.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/email/queue.py b/frappe/email/queue.py index 93d0f00ffc..bae24ebadd 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -346,7 +346,7 @@ def send_one(email, smtpserver=None, auto_commit=True, now=False): def clear_outbox(): """Remove mails older than 31 days in Outbox. Called daily via scheduler.""" frappe.db.sql("""delete from `tabEmail Queue` where - datediff(now(), creation) > 31""") + datediff(now(), modified) > 31""") frappe.db.sql("""update `tabEmail Queue` set status='Expired' - where datediff(curdate(), creation) > 7 and status='Not Sent'""") + where datediff(curdate(), modified) > 7 and status='Not Sent'""") diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index ac1299d345..f5d405cb98 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -133,7 +133,10 @@ def get_context(context): if not frappe.form_dict.name and not frappe.form_dict.new: self.build_as_list(context) else: - name = frappe.db.get_value(self.doc_type, {"owner": frappe.session.user}, "name") + name = None + if frappe.session.user != 'Guest': + name = frappe.db.get_value(self.doc_type, {"owner": frappe.session.user}, "name") + if name: frappe.form_dict.name = name else: