Projet

Général

Profil

0001-consider-all-user-forms-even-if-formdef-if-disabled-.patch

Thomas Noël, 17 juin 2016 17:45

Télécharger (2,26 ko)

Voir les différences:

Subject: [PATCH] consider all user forms, even if formdef if disabled (#11288)

 extra/modules/myspace.py | 6 +++---
 extra/modules/root.py    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
extra/modules/myspace.py
383 383
        return Directory._q_traverse(self, path)
384 384

  
385 385
    def forms(self):
386
        formdefs = FormDef.select(lambda x: not x.is_disabled(), order_by = 'name')
386
        formdefs = FormDef.select(order_by='name', ignore_errors=True)
387 387
        user_forms = []
388 388
        for formdef in formdefs:
389 389
            user_forms.extend(formdef.data_class().get_with_indexed_value(
......
401 401
        forms_output = []
402 402
        for form in user_forms:
403 403
            visible_status = form.get_visible_status(user=self.user)
404
            # skip hidden forms
404
            # skip drafts and hidden forms
405 405
            if not visible_status:
406 406
                continue
407 407
            name = form.formdef.name
......
455 455

  
456 456
        user_forms = []
457 457
        if user:
458
            formdefs = FormDef.select(lambda x: not x.is_disabled(), order_by = 'name')
458
            formdefs = FormDef.select(order_by='name', ignore_errors=True)
459 459
            user_forms = []
460 460
            for formdef in formdefs:
461 461
                user_forms.extend(formdef.data_class().get_with_indexed_value(
extra/modules/root.py
84 84
        r = TemplateIO(html=True)
85 85
        base_url = get_publisher().get_root_url()
86 86

  
87
        draft = [x for x in user_forms if x.is_draft()]
87
        draft = [x for x in user_forms if x.is_draft() and not x.formdef.is_disabled()]
88 88
        if draft:
89 89
            r += htmltext('<h4 id="drafts">%s</h4>') % _('My Current Drafts')
90 90
            r += htmltext('<ul>')
91
-