Projet

Général

Profil

0001-ignore-empty-formdefs-34392.patch

Benjamin Dauvergne, 30 juillet 2019 19:20

Télécharger (1,72 ko)

Voir les différences:

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(-)
tests/conftest.py
85 85
cat.description = ''
86 86
cat.store()
87 87

  
88

  
89
formdef = FormDef()
90
formdef.name = 'Empty'
91
formdef.category_id = cat.id
92
formdef.fields = []
93
formdef.store()
94

  
88 95
formdef = FormDef()
89 96
formdef.name = 'Demande'
90 97
formdef.category_id = cat.id
wcs_olap/feeder.py
511 511
                self.do_dates_table()
512 512
                self.do_base_table()
513 513
            for formdef in self.formdefs:
514
                if not formdef.count:
515
                    continue
514 516
                self.api.cache = {}
515 517
                try:
516 518
                    formdef_feeder = WcsFormdefFeeder(self, formdef, do_feed=self.do_feed)
wcs_olap/wcs_api.py
266 266

  
267 267
    @property
268 268
    def formdefs(self):
269
        result = self.get_json(self.formdefs_url)
269
        result = self.get_json(self.formdefs_url + '?include-count=on')
270 270
        if isinstance(result, dict):
271 271
            if result['err'] == 0:
272 272
                data = result['data']
273
-