From e4e1f99ed1e60bc0f3c8b33aecb15ada1072feec Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 9 Sep 2015 18:16:50 +0530 Subject: [PATCH] [Fixes] Setting folder size --- frappe/core/doctype/file/file.py | 7 +++++-- frappe/utils/file_manager.py | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index bf513fc764..d5480598fd 100644 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -18,7 +18,7 @@ import json class FolderNotEmpty(frappe.ValidationError): pass class File(NestedSet): - nsm_parent_field = 'folder'; + nsm_parent_field = 'folder' no_feed_on_delete = True def before_insert(self): @@ -60,7 +60,8 @@ class File(NestedSet): def set_folder_size(self): """Set folder size if folder""" if self.is_folder and not self.is_new(): - self.fize_size = self.get_folder_size() + self.file_size = self.get_folder_size() + frappe.db.set_value("File", self.name, "file_size", self.file_size) for folder in self.get_ancestors(): frappe.db.set_value("File", folder, "file_size", self.get_folder_size(folder)) @@ -152,6 +153,8 @@ class File(NestedSet): self.check_reference_doc_permission() super(File, self).on_trash() self.delete_file() + + def after_delete(self): self.update_parent_folder_size() def check_folder_is_empty(self): diff --git a/frappe/utils/file_manager.py b/frappe/utils/file_manager.py index c24ab5f136..6b62b0bd54 100644 --- a/frappe/utils/file_manager.py +++ b/frappe/utils/file_manager.py @@ -131,7 +131,6 @@ def get_random_filename(extn=None, content_type=None): return random_string(7) + (extn or "") def save_file(fname, content, dt, dn, folder=None, decode=False): - print [folder] if decode: if isinstance(content, unicode): content = content.encode("utf-8")