From 5ee0b2db6ca71f8f443682213363ed4383659358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Sun, 8 Nov 2015 12:15:51 +0100
Subject: [PATCH 3/3] backoffice: include formdata channel name in submission
 screen (#8913)

---
 tests/test_backoffice_pages.py | 11 +++++++++--
 wcs/backoffice/submission.py   |  9 ++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/tests/test_backoffice_pages.py b/tests/test_backoffice_pages.py
index 61e8a6b..e8bba14 100644
--- a/tests/test_backoffice_pages.py
+++ b/tests/test_backoffice_pages.py
@@ -722,13 +722,20 @@ def test_backoffice_submission_drafts(pub):
     assert 'Check values then click submit.' in resp.body
 
     assert data_class.count() == 1
-    formdata_no = data_class.select()[0].id
+    formdata = data_class.select()[0]
+    formdata_no = formdata.id
     tracking_code = data_class.select()[0].tracking_code
 
     # stop here, go back to index
     resp = app.get('/backoffice/submission/')
     assert '%s/%s' % (formdef.url_name, formdata_no) in resp.body
-    resp = resp.click('Draft')
+    assert '>#%s' % formdata_no in resp.body
+    formdata.submission_context = {'channel': 'mail'}
+    formdata.store()
+    resp = app.get('/backoffice/submission/')
+    assert '>Mail #%s' % formdata_no in resp.body
+
+    resp = resp.click('#%s' % formdata_no)
     resp = resp.follow()
     assert tracking_code in resp.body
     resp = resp.form.submit('previous')
diff --git a/wcs/backoffice/submission.py b/wcs/backoffice/submission.py
index 77e5ea4..f0004ff 100644
--- a/wcs/backoffice/submission.py
+++ b/wcs/backoffice/submission.py
@@ -201,7 +201,14 @@ class SubmissionDirectory(Directory):
                 continue
             for formdata in formdatas:
                 r += htmltext('<li class="smallitem">')
-                label = _('Draft #%s, %s') % (formdata.id,
+                label = ''
+                if formdata.submission_context and formdata.submission_context.get('channel'):
+                    label = {
+                            'mail': _('Mail'),
+                        }.get(formdata.submission_context['channel']) or ''
+                    if label:
+                        label += ' '
+                label += _('#%s, %s') % (formdata.id,
                         misc.localstrftime(formdata.receipt_time))
                 r += htmltext('<a href="%s/%s">%s</a>') % (
                         formdef.url_name, formdata.id, label)
-- 
2.6.2