From a962318f6ed4f2212bdb154a697be62964dbbe46 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 2 Jul 2015 17:49:14 +0530 Subject: [PATCH 1/2] [fix] Match conditions for shared docs --- frappe/model/db_query.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index 2169fb192e..e73096663a 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -297,7 +297,7 @@ class DatabaseQuery(object): # share is an OR condition, if there is a role permission if not only_if_shared and self.shared: - self.match_conditions.append(" or {0}".format(self.get_share_condition())) + self.match_conditions.append(self.get_share_condition()) if as_condition: conditions = "" From 782b82e0c3862329348152845a57b8ce44085641 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 2 Jul 2015 18:27:18 +0600 Subject: [PATCH 2/2] bumped to version 5.0.31 --- 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 0442ecc3f7..2565ca18b0 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "5.0.30" +__version__ = "5.0.31" diff --git a/frappe/hooks.py b/frappe/hooks.py index 0bb10a49d0..0454dc1bf9 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -4,7 +4,7 @@ app_title = "Frappe Framework" app_publisher = "Frappe Technologies Pvt. Ltd." app_description = "Full Stack Web Application Framework in Python" app_icon = "octicon octicon-circuit-board" -app_version = "5.0.30" +app_version = "5.0.31" app_color = "orange" app_email = "support@frappe.io" diff --git a/setup.py b/setup.py index c2b8c7e3bf..7dfe7fb881 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = "5.0.30" +version = "5.0.31" with open("requirements.txt", "r") as f: install_requires = f.readlines()