Skip to content

Commit 6e3abd4

Browse files
authored
Merge pull request #132 from ikseek/master
Handle ValidationErrors having just plain messages list
2 parents 7a9ec54 + 37d2c96 commit 6e3abd4

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

import_export_celery/tasks.py

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -142,17 +142,23 @@ def before_import_row(self, row, **kwargs):
142142
cols = lambda row: "</td><td>".join(
143143
[str(field) for field in row.values]
144144
)
145-
cols_error = lambda row: "".join(
146-
[
147-
"<mark>"
148-
+ key
149-
+ "</mark>"
150-
+ "<br>"
151-
+ row.error.message_dict[key][0]
152-
+ "<br>"
153-
for key in row.error.message_dict.keys()
154-
]
155-
)
145+
146+
def cols_error(row):
147+
if hasattr(row.error, "message_dict"):
148+
return "".join(
149+
[
150+
"<mark>"
151+
+ key
152+
+ "</mark>"
153+
+ "<br>"
154+
+ row.error.message_dict[key][0]
155+
+ "<br>"
156+
for key in row.error.message_dict.keys()
157+
]
158+
)
159+
else:
160+
return "".join(message + "<br>" for message in row.error.messages)
161+
156162
summary += (
157163
"<tr><td>row</td>"
158164
+ "<td>errors</td><td>"

0 commit comments

Comments
 (0)