Merge pull request #778 from anandpdoshi/anand-august-18

frappe.utils.sort and print.py precaution
This commit is contained in:
Rushabh Mehta 2014-08-18 22:41:44 +05:30
commit a568f3d4ff
3 changed files with 10 additions and 3 deletions

View file

@ -118,6 +118,9 @@ class Document(BaseDocument):
raise frappe.PermissionError("No permission to {} {} {}".format(perm_type, self.doctype, self.name or ""))
def insert(self, ignore_permissions=None):
if getattr(self, "in_print", False):
return
if ignore_permissions!=None:
self.ignore_permissions = ignore_permissions
@ -156,6 +159,9 @@ class Document(BaseDocument):
return self
def save(self, ignore_permissions=None):
if getattr(self, "in_print", False):
return
if ignore_permissions!=None:
self.ignore_permissions = ignore_permissions

View file

@ -170,8 +170,8 @@ frappe.utils = {
},
sort: function(list, key, compare_type, reverse) {
if(list.length < 2)
return list;
if(!list || list.length < 2)
return list || [];
var sort_fn = {
"string": function(a, b) {

View file

@ -29,7 +29,6 @@ def get_context(context):
}
doc = frappe.get_doc(frappe.form_dict.doctype, frappe.form_dict.name)
meta = frappe.get_meta(doc.doctype)
return {
@ -55,6 +54,8 @@ def get_html(doc, name=None, print_format=None, meta=None,
if isinstance(doc, basestring):
doc = frappe.get_doc(json.loads(doc))
doc.in_print = True
validate_print_permission(doc)
if hasattr(doc, "before_print"):