Merge branch 'develop'
This commit is contained in:
commit
f4f4462c27
5 changed files with 14 additions and 11 deletions
|
|
@ -1 +1 @@
|
|||
__version__ = "4.4.2"
|
||||
__version__ = "4.4.3"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
2
setup.py
2
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()
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue