Merge branch 'develop'
This commit is contained in:
commit
632c48ecb1
5 changed files with 20 additions and 4 deletions
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
from __future__ import unicode_literals
|
||||
__version__ = "6.4.4"
|
||||
__version__ = "6.4.5"
|
||||
|
|
|
|||
|
|
@ -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"""
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
2
setup.py
2
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()
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue