Merge branch 'master' of git://github.com/webnotes/wnframework
This commit is contained in:
commit
baa9be2c16
3 changed files with 11 additions and 3 deletions
1
README
Normal file
1
README
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Web Notes Framework: A web application framework with client-side and server-side libraries including metadata definition, forms, virtual pages- Ideal for developing js driven database apps.
|
||||||
|
|
@ -246,8 +246,9 @@ class Database:
|
||||||
return r and (len(r) > 1 and (i[0] for i in r) or r[0][0]) or None
|
return r and (len(r) > 1 and (i[0] for i in r) or r[0][0]) or None
|
||||||
|
|
||||||
def set_value(self, dt, dn, field, val):
|
def set_value(self, dt, dn, field, val):
|
||||||
|
from webnotes.utils import now
|
||||||
if dn and dt!=dn:
|
if dn and dt!=dn:
|
||||||
self.sql("update `tab"+dt+"` set `"+field+"`=%s where name=%s", (val, dn))
|
self.sql("update `tab"+dt+"` set `"+field+"`=%s, modified=%s where name=%s", (val, dn, now()))
|
||||||
else:
|
else:
|
||||||
if self.sql("select value from tabSingles where field=%s and doctype=%s", (field, dt)):
|
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=%s and doctype=%s", (val, field, dt))
|
||||||
|
|
|
||||||
|
|
@ -38,11 +38,17 @@ def delete_doc(doctype=None, name=None, doclist = None):
|
||||||
import webnotes.model.meta
|
import webnotes.model.meta
|
||||||
sql = webnotes.conn.sql
|
sql = webnotes.conn.sql
|
||||||
|
|
||||||
|
# get from form
|
||||||
if not doctype:
|
if not doctype:
|
||||||
doctype = webnotes.form_dict.get('dt')
|
doctype = webnotes.form_dict.get('dt')
|
||||||
name = webnotes.form_dict.get('dn')
|
name = webnotes.form_dict.get('dn')
|
||||||
if not doctype:
|
|
||||||
webnotes.msgprint('Nothing to delete!', raise_exception =1)
|
if not doctype:
|
||||||
|
webnotes.msgprint('Nothing to delete!', raise_exception =1)
|
||||||
|
|
||||||
|
# already deleted..?
|
||||||
|
if not webnotes.conn.exists(doctype, name):
|
||||||
|
return
|
||||||
|
|
||||||
tablefields = webnotes.model.meta.get_table_fields(doctype)
|
tablefields = webnotes.model.meta.get_table_fields(doctype)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue