From 4a76d8f425587038d46e8644a44f70f6f6c17951 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 12 Mar 2013 14:28:29 +0530 Subject: [PATCH] fixes to about us --- webnotes/db.py | 7 ++++--- webnotes/model/bean.py | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/webnotes/db.py b/webnotes/db.py index 9db39ac714..b20dd9aa8d 100644 --- a/webnotes/db.py +++ b/webnotes/db.py @@ -341,11 +341,12 @@ class Database: if self.sql("select value from tabSingles where field=%s and doctype=%s", (field, dt)): self.sql("""update tabSingles set value=%s where field=%s and doctype=%s""", (val, field, dt)) - self.sql("""update tabSingles set value=%s where field="modified" and doctype=%s""", - (now(), dt)) else: self.sql("""insert into tabSingles(doctype, field, value) - values (%s, %s, %s), (%s, "modified", %s)""", (dt, field, val, dt, modified or now())) + values (%s, %s, %s)""", (dt, field, val, )) + + if field!="modified": + self.set_value(dt, dn, "modified", modified or now()) def set(self, doc, field, val): from webnotes.utils import now diff --git a/webnotes/model/bean.py b/webnotes/model/bean.py index 42417a544b..3c5a03907f 100644 --- a/webnotes/model/bean.py +++ b/webnotes/model/bean.py @@ -114,6 +114,8 @@ class Bean: if not cint(self.doc.fields.get('__islocal')): if is_single(self.doc.doctype): modified = webnotes.conn.get_value(self.doc.doctype, self.doc.name, "modified") + if isinstance(modified, list): + modified = modified[0] if cstr(modified) and cstr(modified) != cstr(self.doc.modified): conflict = True else: