[rename] [fix] merge related fixes

This commit is contained in:
Anand Doshi 2013-05-09 13:21:12 +05:30
parent b1ad44c13d
commit b5960f2fb6

View file

@ -236,7 +236,8 @@ Thank you,<br>
where name=%s""", (newdn, newdn))
# update __Auth table
webnotes.conn.sql("""update __Auth set user=%s where user=%s""", (newdn, olddn))
if not merge:
webnotes.conn.sql("""update __Auth set user=%s where user=%s""", (newdn, olddn))
def validate_rename(self, newdn, olddn):
# do not allow renaming administrator and guest