From cb5252608d4642258cfc826cdb4887914728a5d3 Mon Sep 17 00:00:00 2001 From: Kanchan Chauhan Date: Sun, 24 Jul 2016 00:30:41 +0530 Subject: [PATCH 1/5] Logout issue on not providing password fixed for Email Account --- frappe/email/doctype/email_account/email_account.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index 4c71c31dcf..845e82c315 100755 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -93,6 +93,8 @@ class EmailAccount(Document): if self.enable_outgoing: if not self.smtp_server: frappe.throw(_("{0} is required").format("SMTP Server")) + if not self.password: + frappe.throw(_("{0} is required").format("Password")) server = SMTPServer(login = getattr(self, "login_id", None) \ or self.email_id, @@ -105,6 +107,9 @@ class EmailAccount(Document): def get_server(self, in_receive=False): """Returns logged in POP3 connection object.""" + if not self.password: + frappe.throw(_("{0} is required").format("Password")) + args = { "host": self.email_server, "use_ssl": self.use_ssl, From 957048457de1b2cd1d325967144fe03f0212a6ca Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Sun, 24 Jul 2016 18:43:07 +0530 Subject: [PATCH 2/5] [fix] get https url if ssl certificate is present or wildcard domain match --- frappe/utils/data.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 742e7e9b48..ca6a689584 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -568,8 +568,20 @@ def get_url(uri=None, full_address=False): if hasattr(frappe.local, "request") and frappe.local.request and frappe.local.request.host: protocol = 'https' == frappe.get_request_header('X-Forwarded-Proto', "") and 'https://' or 'http://' host_name = protocol + frappe.local.request.host + elif frappe.local.site: - host_name = "http://{}".format(frappe.local.site) + protocol = 'http://' + + if frappe.local.conf.ssl_certificate: + protocol = 'https://' + + elif frappe.local.conf.wildcard: + domain = frappe.local.conf.wildcard.get('domain') + if domain and frappe.local.site.endswith(domain) and frappe.local.conf.wildcard.get('ssl_certificate'): + protocol = 'https://' + + host_name = protocol + frappe.local.site + else: host_name = frappe.db.get_value("Website Settings", "Website Settings", "subdomain") From d203857c83ea48bf206bb0de171794f289103d12 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sun, 24 Jul 2016 22:55:13 +0530 Subject: [PATCH 3/5] [fix] desktop icons frappe/erpnext#5850 --- frappe/desk/doctype/desktop_icon/desktop_icon.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frappe/desk/doctype/desktop_icon/desktop_icon.py b/frappe/desk/doctype/desktop_icon/desktop_icon.py index 37f697dba8..2855d9bcb1 100644 --- a/frappe/desk/doctype/desktop_icon/desktop_icon.py +++ b/frappe/desk/doctype/desktop_icon/desktop_icon.py @@ -66,12 +66,9 @@ def get_desktop_icons(user=None): for standard_icon in standard_icons: if standard_icon.module_name not in user_icon_names: - # flag for modules_setup page - standard_icon.hidden_in_standard = standard_icon.hidden - # if blocked, hidden too! if standard_icon.blocked: - standard_icon.hidden = 1 + standard_icon.hidden_in_standard = 1 user_icons.append(standard_icon) From e23ff8fae16ae6a1c1e2dc12b0ba79d1616690e7 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sun, 24 Jul 2016 23:06:17 +0530 Subject: [PATCH 4/5] [fix] desktop icons test --- frappe/desk/doctype/desktop_icon/desktop_icon.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/desk/doctype/desktop_icon/desktop_icon.py b/frappe/desk/doctype/desktop_icon/desktop_icon.py index 2855d9bcb1..32ce5275e9 100644 --- a/frappe/desk/doctype/desktop_icon/desktop_icon.py +++ b/frappe/desk/doctype/desktop_icon/desktop_icon.py @@ -68,6 +68,7 @@ def get_desktop_icons(user=None): # if blocked, hidden too! if standard_icon.blocked: + standard_icon.hidden = 1 standard_icon.hidden_in_standard = 1 user_icons.append(standard_icon) From 1a118ad3f54b38b1733c8fc2010ee3759015a7f4 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 25 Jul 2016 00:16:57 +0600 Subject: [PATCH 5/5] bumped to version 7.0.2 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 26058ce943..20efa7b002 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = "7.0.1" +__version__ = "7.0.2" local = Local()