From 14a8977f006ae8cda44062669f83ea4d21c15d79 Mon Sep 17 00:00:00 2001
From: benjamin <benjamin@le-filament.com>
Date: Wed, 9 Feb 2022 14:48:23 +0100
Subject: [PATCH] [fix] rebase error
---
controllers/main.py | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/controllers/main.py b/controllers/main.py
index a97ec69..62e3d64 100644
--- a/controllers/main.py
+++ b/controllers/main.py
@@ -48,13 +48,8 @@ class JournalDatasExport(http.Controller):
for line in export_line_ids:
row = []
for field in export_id.fields_ids:
-<<<<<<< HEAD
- if field["field_name"].startswith("line."):
- value = safe_eval(field["field_name"], {"line": line}, mode="eval")
-=======
if field.is_python:
- value = safe_eval(field["field_name"], {'line': line}, mode="eval")
->>>>>>> ebb23a7 ([add] is_python on export.journal.field)
+ value = safe_eval(field["field_name"], {"line": line}, mode="eval")
else:
value = safe_eval(field["field_name"])
row.append(value)
--
GitLab