Parcourir la source

Fix in error message on deletion: show parent name if it exists

version-14
Anand Doshi il y a 13 ans
Parent
révision
ac79e47ce6
1 fichiers modifiés avec 2 ajouts et 2 suppressions
  1. +2
    -2
      py/webnotes/model/__init__.py

+ 2
- 2
py/webnotes/model/__init__.py Voir le fichier

@@ -50,12 +50,12 @@ def check_if_doc_is_linked(dt, dn):
else: else:
item = None item = None
try: try:
item = sql("select name, parent from `tab%s` where `%s`='%s' and docstatus!=2 limit 1" % (link_dt, link_field, dn))
item = sql("select name, parent, parenttype from `tab%s` where `%s`='%s' and docstatus!=2 limit 1" % (link_dt, link_field, dn))
except Exception, e: except Exception, e:
if e.args[0]==1146: pass if e.args[0]==1146: pass
else: raise e else: raise e
if item: if item:
webnotes.msgprint("Cannot delete %s <b>%s</b> because it is linked in %s <b>%s</b>" % (dt, dn, link_dt, item[0][1] or item[0][0]), raise_exception=1)
webnotes.msgprint("Cannot delete %s <b>%s</b> because it is linked in %s <b>%s</b>" % (dt, dn, item[0][2] or link_dt, item[0][1] or item[0][0]), raise_exception=1)


@webnotes.whitelist() @webnotes.whitelist()
def delete_doc(doctype=None, name=None, doclist = None, force=0): def delete_doc(doctype=None, name=None, doclist = None, force=0):


Chargement…
Annuler
Enregistrer