From b016e9638f0d4dcdd0d7d36137165dda2761943a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Mon, 7 Dec 2015 22:40:45 +0100
Subject: [PATCH] backoffice: list (almost) all formdata in 360 user view
 (#9011)

Formdata that are not viewable by the user are displayed but not linked, but
it's possible to mark some formdefs as never appearing in 360 user view.
---
 tests/test_backoffice_pages.py      | 20 +++++++++++++++++++
 wcs/admin/forms.py                  | 17 +++++++++++++++--
 wcs/backoffice/management.py        | 38 +++++++++++++++++++++++++++----------
 wcs/formdef.py                      |  4 ++--
 wcs/qommon/static/css/dc2/admin.css |  4 ++++
 5 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/tests/test_backoffice_pages.py b/tests/test_backoffice_pages.py
index 829fbac..c2437cd 100644
--- a/tests/test_backoffice_pages.py
+++ b/tests/test_backoffice_pages.py
@@ -1434,6 +1434,26 @@ def test_360_user_view(pub):
     resp = app.get('/backoffice/management/users/%s/' % user.id)
     for item in to_match:
         assert item in resp.body
+    count_li = resp.body.count('<li')
+
+    # check list items are displayed, without links, if we cannot view them.
+    formdef = FormDef.get_by_urlname('form-title')
+    formdef.workflow_roles['_receiver'] = 'XXX'
+    formdef.store()
+    formdef.data_class().rebuild_security()
+
+    resp = app.get('/backoffice/management/users/%s/' % user.id)
+    for item in to_match:
+        assert not item in resp.body # not linked
+    assert resp.body.count('<li') == count_li
+
+    # mark formdef so it's not listed in 360 view
+    formdef.skip_from_360_view = True
+    formdef.store()
+
+    # check formdatas are no longer part of the page
+    resp = app.get('/backoffice/management/users/%s/' % user.id)
+    assert resp.body.count('<li') == (count_li - 2)
 
 def test_360_user_view_tracking_code(pub):
     if not pub.is_using_postgresql():
diff --git a/wcs/admin/forms.py b/wcs/admin/forms.py
index 53cc82e..2daab5f 100644
--- a/wcs/admin/forms.py
+++ b/wcs/admin/forms.py
@@ -134,7 +134,7 @@ class FieldsDirectory(FieldsDirectory):
 class OptionsDirectory(Directory):
     _q_exports = ['confirmation', 'private_status', 'only_allow_one',
             'always_advertise', 'tracking_code', 'online_status', 'captcha',
-            'description', 'keywords', 'category']
+            'description', 'keywords', 'category', ('360_view', 'p_360_view')]
 
     def __init__(self, formdef):
         self.formdef = formdef
@@ -181,6 +181,13 @@ class OptionsDirectory(Directory):
                 value=self.formdef.has_captcha)
         return self.handle(form, _('CAPTCHA'))
 
+    def p_360_view(self):
+        form = Form(enctype='multipart/form-data')
+        form.add(CheckboxWidget, 'skip_from_360_view',
+                title=_('Skip from 360 view'),
+                value=self.formdef.skip_from_360_view)
+        return self.handle(form, _('Skip from 360 view'))
+
     def online_status(self):
         form = Form(enctype='multipart/form-data')
         form.add(CheckboxWidget, 'disabled',
@@ -232,7 +239,8 @@ class OptionsDirectory(Directory):
                     'enable_tracking_codes', 'private_status_and_history',
                     'always_advertise', 'disabled_redirection',
                     'publication_date', 'expiration_date', 'has_captcha',
-                    'description', 'keywords', 'category_id']
+                    'description', 'keywords', 'category_id',
+                    'skip_from_360_view']
             for f in attrs:
                 widget = form.get_widget(f)
                 if widget:
@@ -440,6 +448,11 @@ class FormDefPage(Directory):
                     self.formdef.always_advertise and
                     C_('display to unlogged|Enabled') or C_('display to unlogged|Disabled'))
 
+        r += add_option_line('options/360_view',
+                _('Skip from 360 view'),
+                self.formdef.skip_from_360_view and
+                C_('skip from 360 view|Enabled') or C_('skip from 360 view|Disabled'))
+
         r += add_option_line('options/tracking_code',
                 _('Tracking Code'),
                 self.formdef.enable_tracking_codes and
diff --git a/wcs/backoffice/management.py b/wcs/backoffice/management.py
index 9646418..3624e4f 100644
--- a/wcs/backoffice/management.py
+++ b/wcs/backoffice/management.py
@@ -42,7 +42,7 @@ from qommon import ods
 from qommon.form import *
 from qommon.sms import SMS
 from qommon.storage import (Equal, NotEqual, LessOrEqual, GreaterOrEqual, Or,
-        Intersects, ILike, FtsMatch)
+        Intersects, ILike, FtsMatch, Contains)
 
 from wcs.forms.backoffice import FormDefUI
 from wcs.forms.common import FormStatusPage
@@ -158,14 +158,24 @@ class UserViewDirectory(Directory):
         get_response().breadcrumb.append(('%s/' % self.user.id, self.user.display_name))
         html_top('management', _('Management'))
         # display list of open formdata for the user
-        user_roles = [logged_users_role().id] + (get_request().user.roles or [])
+        formdefs = [x for x in FormDef.select() if not x.skip_from_360_view]
+        user_roles = set([logged_users_role().id] + (get_request().user.roles or []))
         criterias = [Equal('is_at_endpoint', False),
                      Equal('user_id', str(self.user.id)),
-                     Intersects('concerned_roles_array', user_roles),
+                     Contains('formdef_id', [x.id for x in formdefs]),
                     ]
         from wcs import sql
         formdatas = sql.AnyFormData.select(criterias, order_by='receipt_time')
 
+        criterias = [Equal('is_at_endpoint', False),
+                     Equal('user_id', str(self.user.id)),
+                     Intersects('concerned_roles_array', user_roles),
+                    ]
+        viewable_formdatas = sql.AnyFormData.select(criterias)
+        viewable_formdatas_ids = {}
+        for viewable_formdata in viewable_formdatas:
+            viewable_formdatas_ids[(viewable_formdata.formdef.id, viewable_formdata.id)] = True
+
         r = TemplateIO(html=True)
         r += get_session().display_message()
 
@@ -209,7 +219,7 @@ class UserViewDirectory(Directory):
                         cat_formdatas = formdata_by_category[cat.id]
                 else:
                     cat_formdatas = formdatas
-                r += htmltext('<ul class="biglist">')
+                r += htmltext('<ul class="biglist c-360-user-view">')
                 for formdata in cat_formdatas:
                     status = formdata.get_status()
                     if status:
@@ -218,12 +228,20 @@ class UserViewDirectory(Directory):
                         status_label = _('Unknown')
                     submit_date = misc.strftime.strftime(
                             misc.date_format(), formdata.receipt_time)
-                    r += htmltext('<li><a href="%s">%s, '
-                                  '<span class="datetime">%s</span> '
-                                  '<span class="status">(%s)</span></a>' % (
-                            formdata.get_url(backoffice=True),
-                            formdata.formdef.name,
-                            submit_date, status_label))
+                    formdata_key_id = (formdata.formdef.id, formdata.id)
+                    if formdata_key_id in viewable_formdatas_ids:
+                        r += htmltext('<li><a href="%s">%s, '
+                                      '<span class="datetime">%s</span> '
+                                      '<span class="status">(%s)</span></a>' % (
+                                formdata.get_url(backoffice=True),
+                                formdata.formdef.name,
+                                submit_date, status_label))
+                    else:
+                        r += htmltext('<li><span>%s, '
+                                      '<span class="datetime">%s</span> '
+                                      '<span class="status">(%s)</span></span>' % (
+                                formdata.formdef.name,
+                                submit_date, status_label))
                     if formdata.formdef.enable_tracking_codes:
                         r += htmltext('<p class="commands">')
                         r += command_icon('sendcode/%s/%s' %
diff --git a/wcs/formdef.py b/wcs/formdef.py
index f84ccae..7cc8fde 100644
--- a/wcs/formdef.py
+++ b/wcs/formdef.py
@@ -85,7 +85,7 @@ class FormDef(StorableObject):
     publication_date = None
     expiration_date = None
     has_captcha = False
-
+    skip_from_360_view = False
     private_status_and_history = False
 
     last_modification_time = None
@@ -100,7 +100,7 @@ class FormDef(StorableObject):
     BOOLEAN_ATTRIBUTES = ['discussion', 'detailed_emails', 'disabled',
             'only_allow_one', 'enable_tracking_codes',
             'always_advertise', 'private_status_and_history',
-            'has_captcha']
+            'has_captcha', 'skip_from_360_view']
 
     def migrate(self):
         changed = False
diff --git a/wcs/qommon/static/css/dc2/admin.css b/wcs/qommon/static/css/dc2/admin.css
index 324b497..1b5d27d 100644
--- a/wcs/qommon/static/css/dc2/admin.css
+++ b/wcs/qommon/static/css/dc2/admin.css
@@ -1166,3 +1166,7 @@ div.file-validation {
 ul.apps {
 	margin-left: 1em;
 }
+
+.c-360-user-view li > span {
+	padding-left: 1ex;
+}
-- 
2.6.2