From 08d94920f641fc87d6385b5de5ac71c3ec9d8ec2 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 26 Sep 2014 18:04:18 +0530 Subject: [PATCH 1/3] [minor] Unicode issue in quote url --- frappe/utils/data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/data.py b/frappe/utils/data.py index c4641aafec..80de3ddab5 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -580,7 +580,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) From 654f55f5a1b9053d40d34452d809b588d42796fd Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sat, 27 Sep 2014 11:27:01 +0530 Subject: [PATCH 2/3] [fix] linked_with ignore if no permissions --- frappe/widgets/form/utils.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/frappe/widgets/form/utils.py b/frappe/widgets/form/utils.py index 1440671cc6..e293a4c829 100644 --- a/frappe/widgets/form/utils.py +++ b/frappe/widgets/form/utils.py @@ -118,13 +118,17 @@ 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 @@ -132,5 +136,4 @@ def get_linked_docs(doctype, name, metadata_loaded=None, no_metadata=False): if not no_metadata and not dt in metadata_loaded: frappe.local.response.docs.extend(link_meta_bundle) - return results From f31c17ee23a9df8ca7397ed5c1de0d3842ae16c0 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Mon, 29 Sep 2014 16:09:05 +0600 Subject: [PATCH 3/3] bumped to version 4.4.3 --- frappe/__version__.py | 2 +- frappe/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/__version__.py b/frappe/__version__.py index 30357c8bf7..548e0f6d83 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1 +1 @@ -__version__ = "4.4.2" +__version__ = "4.4.3" diff --git a/frappe/hooks.py b/frappe/hooks.py index fd8ff09591..03a51c7ae1 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -3,7 +3,7 @@ app_title = "Frappe Framework" app_publisher = "Web Notes Technologies Pvt. Ltd." app_description = "Full Stack Web Application Framework in Python" app_icon = "assets/frappe/images/frappe.svg" -app_version = "4.4.2" +app_version = "4.4.3" app_color = "#3498db" app_email = "support@frappe.io" diff --git a/setup.py b/setup.py index e6211708ec..c953d2ec21 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = "4.4.2" +version = "4.4.3" with open("requirements.txt", "r") as f: install_requires = f.readlines()