From 9ee2f07b3047ecef8fdb973accdc8e18f2514cb7 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 27 Apr 2017 09:03:24 +0530 Subject: [PATCH] [hot] fix email_account --- frappe/email/doctype/email_account/email_account.py | 10 +++++----- frappe/public/js/frappe/desk.js | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index 5789848e97..acf72cdea2 100755 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -61,7 +61,7 @@ class EmailAccount(Document): if (not self.awaiting_password and not frappe.local.flags.in_install and not frappe.local.flags.in_patch): - if self.password or self.smtp_server in ('127.0.0.1' or 'localhost'): + if self.password or self.smtp_server in ('127.0.0.1', 'localhost'): if self.enable_incoming: self.get_incoming_server() self.no_failed = 0 @@ -331,7 +331,7 @@ class EmailAccount(Document): raise SentEmailInInbox if email.message_id: - names = frappe.db.sql("""select distinct name from tabCommunication + names = frappe.db.sql("""select distinct name from tabCommunication where message_id='{message_id}' order by creation desc limit 1""".format( message_id=email.message_id @@ -591,7 +591,7 @@ class EmailAccount(Document): if not self.use_imap: return - flags = frappe.db.sql("""select name, communication, uid, action from + flags = frappe.db.sql("""select name, communication, uid, action from `tabEmail Flag Queue` where is_completed=0 and email_account='{email_account}' """.format(email_account=self.name), as_dict=True) @@ -614,7 +614,7 @@ class EmailAccount(Document): self.set_communication_seen_status(docnames, seen=0) docnames = ",".join([ "'%s'"%flag.get("name") for flag in flags ]) - frappe.db.sql(""" update `tabEmail Flag Queue` set is_completed=1 + frappe.db.sql(""" update `tabEmail Flag Queue` set is_completed=1 where name in ({docnames})""".format(docnames=docnames)) def set_communication_seen_status(self, docnames, seen=0): @@ -622,7 +622,7 @@ class EmailAccount(Document): if not docnames: return - frappe.db.sql(""" update `tabCommunication` set seen={seen} + frappe.db.sql(""" update `tabCommunication` set seen={seen} where name in ({docnames})""".format(docnames=docnames, seen=seen)) @frappe.whitelist() diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 6de6d318b3..2f00c2ea63 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -328,6 +328,7 @@ frappe.Application = Class.extend({ if(!frappe.app.session_expired_dialog) { var dialog = new frappe.ui.Dialog({ title: __('Session Expired'), + keep_open: true, fields: [ { fieldtype:'Password', fieldname:'password', label: __('Please Enter Your Password to Continue') }, @@ -369,7 +370,7 @@ frappe.Application = Class.extend({ // add backdrop $('.modal-backdrop').css({ 'opacity': 1, - 'background-color': '#EBEFF2' + 'background-color': '#4B4C9D' }); } },