From ba0859492bd3f88ce3d4654e74c883b15b5a1713 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Tue, 30 Jul 2019 19:20:42 +0200
Subject: [PATCH] ignore empty formdefs (#34392)

---
 tests/conftest.py   | 7 +++++++
 wcs_olap/feeder.py  | 2 ++
 wcs_olap/wcs_api.py | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 2c5246f..2877f9f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -85,6 +85,13 @@ cat.name = 'Catégorie'
 cat.description = ''
 cat.store()
 
+
+formdef = FormDef()
+formdef.name = 'Empty'
+formdef.category_id = cat.id
+formdef.fields = []
+formdef.store()
+
 formdef = FormDef()
 formdef.name = 'Demande'
 formdef.category_id = cat.id
diff --git a/wcs_olap/feeder.py b/wcs_olap/feeder.py
index 021f3f5..815d700 100644
--- a/wcs_olap/feeder.py
+++ b/wcs_olap/feeder.py
@@ -511,6 +511,8 @@ CREATE TABLE public.dates AS (SELECT
                 self.do_dates_table()
                 self.do_base_table()
             for formdef in self.formdefs:
+                if not formdef.count:
+                    continue
                 self.api.cache = {}
                 try:
                     formdef_feeder = WcsFormdefFeeder(self, formdef, do_feed=self.do_feed)
diff --git a/wcs_olap/wcs_api.py b/wcs_olap/wcs_api.py
index a83b7e1..b713357 100644
--- a/wcs_olap/wcs_api.py
+++ b/wcs_olap/wcs_api.py
@@ -266,7 +266,7 @@ class WcsApi(object):
 
     @property
     def formdefs(self):
-        result = self.get_json(self.formdefs_url)
+        result = self.get_json(self.formdefs_url + '?include-count=on')
         if isinstance(result, dict):
             if result['err'] == 0:
                 data = result['data']
-- 
2.22.0