Ver a proveniência

[report] Handle rows which can be list of dict (#4987)

version-14
Faris Ansari há 7 anos
committed by Nabin Hait
ascendente
cometimento
99b4278f84
1 ficheiros alterados com 7 adições e 3 eliminações
  1. +7
    -3
      frappe/core/doctype/report/report.py

+ 7
- 3
frappe/core/doctype/report/report.py Ver ficheiro

@@ -159,10 +159,14 @@ class Report(Document):
if as_dict: if as_dict:
data = [] data = []
for row in out: for row in out:
_row = frappe._dict()
if isinstance(row, (list, tuple)):
_row = frappe._dict()
for i, val in enumerate(row):
_row[columns[i].get('fieldname')] = val
elif isinstance(row, dict):
# no need to convert from dict to dict
_row = frappe._dict(row)
data.append(_row) data.append(_row)
for i, val in enumerate(row):
_row[columns[i].get('fieldname')] = val
else: else:
data = out data = out
return columns, data return columns, data


Carregando…
Cancelar
Guardar