From ec8eb6b4a56818148a79116086ed8b3eb046cf0d Mon Sep 17 00:00:00 2001
From: Thomas NOEL <tnoel@entrouvert.com>
Date: Mon, 31 Oct 2016 12:00:19 +0100
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(-)

diff --git a/wcs/backoffice/management.py b/wcs/backoffice/management.py
index 4fa91b3..08c5168 100644
--- a/wcs/backoffice/management.py
+++ b/wcs/backoffice/management.py
@@ -222,11 +222,7 @@ class UserViewDirectory(Directory):
                     cat_formdatas = formdatas
                 r += htmltext('<ul class="biglist c-360-user-view">')
                 for formdata in cat_formdatas:
-                    status = formdata.get_status()
-                    if status:
-                        status_label = status.name
-                    else:
-                        status_label = _('Unknown')
+                    status_label = formdata.get_status_label()
                     submit_date = misc.strftime.strftime(
                             misc.date_format(), formdata.receipt_time)
                     formdata_key_id = (formdata.formdef.id, formdata.id)
diff --git a/wcs/formdata.py b/wcs/formdata.py
index 30c518f..adc2dd0 100644
--- a/wcs/formdata.py
+++ b/wcs/formdata.py
@@ -382,7 +382,9 @@ class FormData(StorableObject):
             return None
         return wf_status
 
-    def get_status_label(self, status = None):
+    def get_status_label(self, status=None):
+        if self.is_draft(status):
+            return _('Draft')
         wf_status = self.get_status(status)
         if not wf_status:
             return _('Unknown')
@@ -622,8 +624,10 @@ class FormData(StorableObject):
             return True
         return False
 
-    def is_draft(self):
-        return self.status in ('draft', 'wf-draft')
+    def is_draft(self, status=None):
+        if status is None:
+            status = self.status
+        return status in ('draft', 'wf-draft')
 
     def get_concerned_roles(self):
         if self.is_draft():
-- 
2.10.1