From 6f6fe9a00642aa0d6de62f61eb23ddd5f14423a9 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 26 Jul 2011 18:11:12 +0530 Subject: [PATCH 1/3] fixed spelling mistake in search_criteria.py --- cgi-bin/core/doctype/search_criteria/search_criteria.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cgi-bin/core/doctype/search_criteria/search_criteria.py b/cgi-bin/core/doctype/search_criteria/search_criteria.py index 00e5eb4330..15cfa703c7 100644 --- a/cgi-bin/core/doctype/search_criteria/search_criteria.py +++ b/cgi-bin/core/doctype/search_criteria/search_criteria.py @@ -28,7 +28,7 @@ class DocType: def validate(self): if sql("select name from `tabSearch Criteria` where criteria_name=%s and name!=%s", (self.doc.criteria_name, self.doc.name)): - webnots.msgprint("Criteria Name '%s' already used, please use another name" % self.doc.criteria_name, raise_exception = 1) + webnotes.msgprint("Criteria Name '%s' already used, please use another name" % self.doc.criteria_name, raise_exception = 1) def on_update(self): self.set_module() @@ -72,4 +72,4 @@ class DocType: if os.path.exists(os.path.join(path, old_name + extn)): os.system('cp %s %s' % (os.path.join(path, old_name + extn), \ os.path.join(get_module_path(self.doc.module), 'search_criteria', scrub(self.doc.name), scrub(self.doc.name) + extn))) - \ No newline at end of file + From 182111306c6253104299e485d88ac47b7f21d467 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 3 Aug 2011 11:32:28 +0530 Subject: [PATCH 2/3] checked if duplicate lft, rgt exists in nested set model --- cgi-bin/webnotes/utils/nestedset.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cgi-bin/webnotes/utils/nestedset.py b/cgi-bin/webnotes/utils/nestedset.py index 13af8ec4de..ffeaf7abde 100644 --- a/cgi-bin/webnotes/utils/nestedset.py +++ b/cgi-bin/webnotes/utils/nestedset.py @@ -65,7 +65,11 @@ def update_add_node(doctype, name, parent, parent_field): webnotes.conn.sql("update `tab%s` set rgt = rgt+2 where rgt >= %s" %(doctype,right)) webnotes.conn.sql("update `tab%s` set lft = lft+2 where lft >= %s" %(doctype,right)) - #$ update index of new node + # update index of new node + if webnotes.conn.sql("select * from `tab%s` where lft=%s or rgt=%s"% (doctype, right, right+1)) + webnotes.msgprint("Nested set error. Please send mail to support") + raise Exception + webnotes.conn.sql("update `tab%s` set lft=%s, rgt=%s where name='%s'" % (doctype,right,right+1,name)) return right From 356998c1ff3bf8fa0cd353c1980be2ed49971b3e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 3 Aug 2011 11:55:42 +0530 Subject: [PATCH 3/3] checked if duplicate lft, rgt exists in nested set model --- cgi-bin/webnotes/utils/nestedset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi-bin/webnotes/utils/nestedset.py b/cgi-bin/webnotes/utils/nestedset.py index ffeaf7abde..97cf156074 100644 --- a/cgi-bin/webnotes/utils/nestedset.py +++ b/cgi-bin/webnotes/utils/nestedset.py @@ -66,7 +66,7 @@ def update_add_node(doctype, name, parent, parent_field): webnotes.conn.sql("update `tab%s` set lft = lft+2 where lft >= %s" %(doctype,right)) # update index of new node - if webnotes.conn.sql("select * from `tab%s` where lft=%s or rgt=%s"% (doctype, right, right+1)) + if webnotes.conn.sql("select * from `tab%s` where lft=%s or rgt=%s"% (doctype, right, right+1)): webnotes.msgprint("Nested set error. Please send mail to support") raise Exception