Projet

Général

Profil

0001-display-draft-on-drafts-status-in-360-user-view-1380.patch

Thomas Noël, 31 octobre 2016 14:39

Télécharger (2,1 ko)

Voir les différences:

Subject: [PATCH] display 'draft' on drafts status in 360 user view (#13807)

 wcs/backoffice/management.py |  6 +-----
 wcs/formdata.py              | 10 +++++++---
 2 files changed, 8 insertions(+), 8 deletions(-)
wcs/backoffice/management.py
222 222
                    cat_formdatas = formdatas
223 223
                r += htmltext('<ul class="biglist c-360-user-view">')
224 224
                for formdata in cat_formdatas:
225
                    status = formdata.get_status()
226
                    if status:
227
                        status_label = status.name
228
                    else:
229
                        status_label = _('Unknown')
225
                    status_label = formdata.get_status_label()
230 226
                    submit_date = misc.strftime.strftime(
231 227
                            misc.date_format(), formdata.receipt_time)
232 228
                    formdata_key_id = (formdata.formdef.id, formdata.id)
wcs/formdata.py
382 382
            return None
383 383
        return wf_status
384 384

  
385
    def get_status_label(self, status = None):
385
    def get_status_label(self, status=None):
386
        if self.is_draft(status):
387
            return _('Draft')
386 388
        wf_status = self.get_status(status)
387 389
        if not wf_status:
388 390
            return _('Unknown')
......
622 624
            return True
623 625
        return False
624 626

  
625
    def is_draft(self):
626
        return self.status in ('draft', 'wf-draft')
627
    def is_draft(self, status=None):
628
        if status is None:
629
            status = self.status
630
        return status in ('draft', 'wf-draft')
627 631

  
628 632
    def get_concerned_roles(self):
629 633
        if self.is_draft():
630
-