From a5063faaf82282540eb515a117e89b92d199caf8 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 25 Sep 2015 16:16:18 +0530 Subject: [PATCH 1/3] [minor] frappe.local_cache(namespace, key, generator) for in request caching --- frappe/__init__.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/frappe/__init__.py b/frappe/__init__.py index fc8d85c287..d235600458 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -1033,3 +1033,19 @@ def publish_realtime(*args, **kwargs): import frappe.async return frappe.async.publish_realtime(*args, **kwargs) + +def local_cache(namespace, key, generator): + """A key value store for caching within a request + + :param namespace: frappe.local.cache[namespace] + :param key: frappe.local.cache[namespace][key] used to retrieve value + :param generator: method to generate a value if not found in store + + """ + if namespace not in local.cache: + local.cache[namespace] = {} + + if key not in local.cache[namespace]: + local.cache[namespace][key] = generator() + + return local.cache[namespace][key] From 2a65e087919ac79732d2d50889499885c4b7a9f7 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 25 Sep 2015 17:12:11 +0530 Subject: [PATCH 2/3] [fix] ignore permissions while setting parent folder size --- frappe/core/doctype/file/file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 25be25a1c4..ccfaa3a0b4 100644 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -78,7 +78,7 @@ class File(NestedSet): def update_parent_folder_size(self): """Update size of parent folder""" if self.folder and not self.is_folder: # it not home - frappe.get_doc("File", self.folder).save() + frappe.get_doc("File", self.folder).save(ignore_permissions=True) def set_folder_name(self): """Make parent folders if not exists based on reference doctype and name""" From 87f7e5a7fdfdacff37ca6bd4b40d2b665cebe0bb Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 25 Sep 2015 17:52:08 +0600 Subject: [PATCH 3/3] bumped to version 6.4.5 --- 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 1ee0cffaac..8174811862 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "6.4.4" +__version__ = "6.4.5" diff --git a/frappe/hooks.py b/frappe/hooks.py index 114bbd0cc2..a9017ef876 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -26,7 +26,7 @@ to ERPNext. """ app_icon = "octicon octicon-circuit-board" -app_version = "6.4.4" +app_version = "6.4.5" app_color = "orange" github_link = "https://github.com/frappe/frappe" diff --git a/setup.py b/setup.py index 4f738c389c..7fcfdbd766 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = "6.4.4" +version = "6.4.5" with open("requirements.txt", "r") as f: install_requires = f.readlines()