From 368d11b23e5d3279670c72ba85dfc4a91c25cdc2 Mon Sep 17 00:00:00 2001 From: Fabien Bourgeois Date: Sun, 16 Oct 2016 18:21:41 +0200 Subject: [PATCH] [FIX]GOLEM Activity Registration Export quick fix for display --- golem_activity/views/golem_activity_view.xml | 4 +++- .../controllers/controllers.py | 4 ++-- .../views/golem_activity_view.xml | 13 +++++++------ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/golem_activity/views/golem_activity_view.xml b/golem_activity/views/golem_activity_view.xml index 3036b1f..ddcdd65 100644 --- a/golem_activity/views/golem_activity_view.xml +++ b/golem_activity/views/golem_activity_view.xml @@ -24,8 +24,10 @@ along with this program. If not, see . golem.activity
+
-
diff --git a/golem_activity_registration_export/controllers/controllers.py b/golem_activity_registration_export/controllers/controllers.py index 1106b67..8fc12df 100644 --- a/golem_activity_registration_export/controllers/controllers.py +++ b/golem_activity_registration_export/controllers/controllers.py @@ -26,8 +26,8 @@ class ExportGolemActivityMembers(CSVExport): @http.route('/web/export/golem/activity_members', type='http', auth='user') def export_csv_view(self, data): data = json.loads(data) - FIELDS = ['number', 'lastname', 'firstname', 'contact_address', 'zip', - 'city', 'birthdate_date', 'email', 'phone', 'mobile'] + FIELDS = ['number', 'lastname', 'firstname', 'street', 'zip', 'city', + 'birthdate_date', 'email', 'phone', 'mobile'] aid = data.get('activity_id') a_model = request.env['golem.activity'] activity = a_model.browse([aid]) diff --git a/golem_activity_registration_export/views/golem_activity_view.xml b/golem_activity_registration_export/views/golem_activity_view.xml index 8122604..d6c77f0 100644 --- a/golem_activity_registration_export/views/golem_activity_view.xml +++ b/golem_activity_registration_export/views/golem_activity_view.xml @@ -23,13 +23,14 @@ along with this program. If not, see . Activity Registrations CSV Export golem.activity + ref="golem_activity.view_form" /> - -
+