From ceda0d772e2fba5da7c933a6a673b983333b5229 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 27 Nov 2013 11:02:50 +0530 Subject: [PATCH] [fix] [minor] fixes in patch --- patches/1311/p06_fix_report_columns.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/patches/1311/p06_fix_report_columns.py b/patches/1311/p06_fix_report_columns.py index 3516b38406..4132f17b3a 100644 --- a/patches/1311/p06_fix_report_columns.py +++ b/patches/1311/p06_fix_report_columns.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import webnotes -from webnotes.utils import cstr import json def execute(): @@ -24,12 +23,12 @@ def execute(): for value, key in columns: new_columns = [] column_doctype = key.split(':')[-1] - for child_doctype in doctypes_child_tables_map.get(column_doctype): - for field, field_doctype in json.loads(value): - if field_doctype == child_doctype: - new_columns.append([field, field_doctype]) + for field, field_doctype in json.loads(value): + if field_doctype in doctypes_child_tables_map.get(column_doctype): + new_columns.append([field, field_doctype]) if new_columns: - defkey = "_list_settings:" + column_doctype webnotes.conn.sql("""update `tabDefaultValue` set defvalue=%s - where defkey=%s""" % ('%s', '%s'), (json.dumps(new_columns), defkey)) \ No newline at end of file + where defkey=%s""" % ('%s', '%s'), (json.dumps(new_columns), key)) + else: + webnotes.conn.sql("""delete from `tabDefaultValue` where defkey=%s""", key) \ No newline at end of file