From a3ee77fd9811600f2b4cf6d0769dee3f8bfa9cc7 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 29 Sep 2014 12:46:58 +0530 Subject: [PATCH] [merge] manually update from develop --- frappe/desk/form/utils.py | 15 +++++++++------ frappe/utils/data.py | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/frappe/desk/form/utils.py b/frappe/desk/form/utils.py index f0228a2212..3fdfa46973 100644 --- a/frappe/desk/form/utils.py +++ b/frappe/desk/form/utils.py @@ -122,13 +122,16 @@ def get_linked_docs(doctype, name, metadata_loaded=None, no_metadata=False): fields = ["`tab{dt}`.`{fn}`".format(dt=dt, fn=sf.strip()) for sf in fields if sf] - if link.get("child_doctype"): - ret = frappe.get_list(doctype=dt, fields=fields, - filters=[[link.get('child_doctype'), link.get("fieldname"), '=', name]]) + try: + if link.get("child_doctype"): + ret = frappe.get_list(doctype=dt, fields=fields, + filters=[[link.get('child_doctype'), link.get("fieldname"), '=', name]]) - else: - ret = frappe.get_list(doctype=dt, fields=fields, - filters=[[dt, link.get("fieldname"), '=', name]]) + else: + ret = frappe.get_list(doctype=dt, fields=fields, + filters=[[dt, link.get("fieldname"), '=', name]]) + except frappe.PermissionError: + continue if ret: results[dt] = ret diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 0feaa51847..4f1ed9af44 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -583,7 +583,7 @@ def expand_relative_urls(html): def quote_urls(html): def _quote_url(match): groups = list(match.groups()) - groups[2] = urllib.quote(groups[2], safe="~@#$&()*!+=:;,.?/'") + groups[2] = urllib.quote(groups[2].encode("utf-8"), safe=b"~@#$&()*!+=:;,.?/'").decode("utf-8") return "".join(groups) return re.sub('(href|src){1}([\s]*=[\s]*[\'"]?)((?:http)[^\'">]+)([\'"]?)', _quote_url, html)