0001-misc-remove-private-status-history-option-33155.patch

Frédéric Péters, 19 mai 2019 08:14

Voir les différences: en ligne côte à côte

Subject: [PATCH] misc: remove private status & history option (#33155)

 tests/test_admin_pages.py      | 11 -------
 tests/test_api.py              |  2 +-
 tests/test_backoffice_pages.py | 58 ----------------------------------
 tests/test_formdata.py         | 23 --------------
 wcs/admin/forms.py             | 19 ++---------
 wcs/formdef.py                 |  5 +--
 wcs/forms/root.py              |  1 -
 7 files changed, 5 insertions(+), 114 deletions(-)

         assert_option_display(resp, 'Confirmation Page', 'Disabled')
         assert FormDef.get(1).confirmation == False
         # history and status
         assert_option_display(resp, 'History and Status', 'Public')
         resp = resp.click('History and Status')
         assert resp.forms[0]['private_status_and_history'].checked is False
         resp.forms[0]['private_status_and_history'].checked = True
         resp = resp.forms[0].submit()
         assert resp.location == 'http://example.net/backoffice/forms/1/'
         resp = resp.follow()
         assert_option_display(resp, 'History and Status', 'Private')
         assert FormDef.get(1).private_status_and_history is True
         # Limit to one form
         assert_option_display(resp, 'Limit to one form', 'Disabled')
         resp = resp.click('Limit to one form')

                                              'workflow', 'expiration_date', 'discussion',
                                              'last_modification_time', 'has_captcha',
                                              'always_advertise', 'name', 'disabled', 'only_allow_one',
                                              'private_status_and_history', 'fields', 'keywords',
                                              'fields', 'keywords',
                                              'publication_date', 'detailed_emails',
                                              'disabled_redirection'])
         assert resp.json['name'] == 'test'

         resp = resp2.click('Failed to evaluate condition')
         assert not 'href="http://example.net/backoffice/management/test/' in resp.body
     def test_backoffice_private_status_and_history(pub):
         create_user(pub)
         create_environment(pub)
         formdef = FormDef.get_by_urlname('form-title')
         formdef.private_status_and_history = True
         formdef.store()
         form_class = FormDef.get_by_urlname('form-title').data_class()
         number31 = [x for x in form_class.select() if x.data['1'] == 'FOO BAR 30'][0]
         app = login(get_app(pub))
         resp = app.get('/backoffice/management/form-title/')
         assert re.findall('<tbody.*\/tbody>', resp.body, re.DOTALL)[0].count('<tr') == 17
         # click on a formdata
         resp = resp.click(href='%s/' % number31.id)
         assert (' with the number %s.' % number31.get_display_id()) in resp.body
         resp.forms[0]['comment'] = 'HELLO WORLD'
         resp = resp.forms[0].submit('button_accept')
         resp = resp.follow()
         assert FormDef.get_by_urlname('form-title').data_class().get(number31.id).status == 'wf-accepted'
         assert 'HELLO WORLD' in resp.body
         assert 'id="evolution-log"' in resp.body
     def test_backoffice_private_status_and_history_with_assigned_function(pub):
         create_user(pub)
         create_environment(pub, set_receiver=False)
         formdef = FormDef.get_by_urlname('form-title')
         formdef.private_status_and_history = True
         formdef.store()
         form_class = FormDef.get_by_urlname('form-title').data_class()
         number31 = [x for x in form_class.select() if x.data['1'] == 'FOO BAR 30'][0]
         app = login(get_app(pub))
         resp = app.get('/backoffice/management/form-title/', status=403)
         # fake function assignment
         number31.workflow_roles = {'_receiver': '1'}
         number31.store()
         resp = app.get('/backoffice/management/form-title/', status=200)
         assert re.findall('<tbody.*\/tbody>', resp.body, re.DOTALL)[0].count('<tr') == 1
         # click on a formdata
         resp = resp.click(href='%s/' % number31.id)
         assert (' with the number %s.' % number31.get_display_id()) in resp.body
         # history is visible
         assert 'id="evolution-log"' in resp.body
         resp.forms[0]['comment'] = 'HELLO WORLD'
         resp = resp.forms[0].submit('button_accept')
         resp = resp.follow()
         assert FormDef.get_by_urlname('form-title').data_class().get(number31.id).status == 'wf-accepted'
         # history is still visible
         assert 'HELLO WORLD' in resp.body
         assert 'id="evolution-log"' in resp.body
     def test_backoffice_formdata_named_wscall(http_requests, pub):
         user = create_user(pub)
         create_environment(pub)

         substvars = formdata.get_substitution_variables()
         assert substvars.get('form_var_backoffice_blah') == 'test'
     def test_private_history(pub, local_user):
         formdef.data_class().wipe()
         formdef.private_status_and_history = True
         formdef.store()
         formdata = formdef.data_class()()
         formdata.store()
         assert formdef.is_user_allowed_read_status_and_history(None, formdata=formdata) is False
         assert formdef.is_user_allowed_read_status_and_history(local_user, formdata=formdata) is False
         local_user.is_admin = True
         assert formdef.is_user_allowed_read_status_and_history(local_user, formdata=formdata) is True
         local_user.is_admin = False
         role = Role(name='foobar')
         role.store()
         formdef.workflow_roles['_receiver'] = role.id
         assert formdef.is_user_allowed_read_status_and_history(local_user, formdata=formdata) is False
         local_user.roles = [role.id]
         assert formdef.is_user_allowed_read_status_and_history(local_user, formdata=formdata) is True
     def test_workflow_data_file_url(pub):
         upload = Upload('test.txt', 'text/plain', 'ascii')
         upload.receive(['first line', 'second line'])

             for f in ('name', 'confirmation',
                         'only_allow_one', 'category_id', 'disabled',
                         'enable_tracking_codes', 'workflow_id', 'private_status_and_history',
                         'enable_tracking_codes', 'workflow_id',
                         'disabled_redirection', 'always_advertise',
                         'publication_date', 'expiration_date'):
                 widget = form.get_widget(f)
-...
     class OptionsDirectory(Directory):
         _q_exports = ['confirmation', 'private_status', 'only_allow_one',
         _q_exports = ['confirmation', 'only_allow_one',
                 'always_advertise', 'tracking_code', 'online_status', 'captcha',
                 'description', 'keywords', 'category', ('360_view', 'p_360_view'),
                 'geolocations', 'appearance', 'templates']
-...
                     value=self.formdef.confirmation)
             return self.handle(form, _('Confirmation Page'))
         def private_status(self):
             form = Form(enctype='multipart/form-data')
             form.add(CheckboxWidget, 'private_status_and_history',
                     title=_('Keep workflow status and history private'),
                     hint=_('Restrict the possibility to see status and history to the recipients'),
                     value=self.formdef.private_status_and_history)
             return self.handle(form, _('History and Status'))
         def only_allow_one(self):
             form = Form(enctype='multipart/form-data')
             form.add(CheckboxWidget, 'only_allow_one',
-...
             if form.is_submitted() and not form.has_errors():
                 attrs = ['confirmation', 'only_allow_one', 'disabled',
                         'enable_tracking_codes', 'private_status_and_history',
                         'enable_tracking_codes',
                         'always_advertise', 'disabled_redirection',
                         'publication_date', 'expiration_date', 'has_captcha',
                         'description', 'keywords', 'category_id',
-...
                     self.formdef.confirmation and
                     C_('confirmation page|Enabled') or C_('confirmation page|Disabled'))
             r += add_option_line('options/private_status',
                     _('History and Status'),
                     self.formdef.private_status_and_history and
                     C_('history and status|Private') or C_('history and status|Public'))
             r += add_option_line('options/only_allow_one',
                     _('Limit to one form'),
                     self.formdef.only_allow_one and

         expiration_date = None
         has_captcha = False
         skip_from_360_view = False
         private_status_and_history = False
         appearance_keywords = None
         digest_template = None
-...
                 'digest_template']
         BOOLEAN_ATTRIBUTES = ['discussion', 'detailed_emails', 'disabled',
                 'only_allow_one', 'enable_tracking_codes', 'confirmation',
                 'always_advertise', 'private_status_and_history',
                 'always_advertise',
                 'has_captcha', 'skip_from_360_view']
         def __init__(self, *args, **kwargs):
-...
             form_roles = [x for x in self.workflow_roles.values() if x]
             if formdata and formdata.workflow_roles:
                 form_roles.extend([x for x in formdata.workflow_roles.values() if x])
             if user and self.private_status_and_history and not user_roles.intersection(form_roles):
                 return False
             return self.is_user_allowed_read(user, formdata=formdata)
         def is_disabled(self):

                 # XXX: seperate endpoints from non-endpoints
                 for status in workflow.possible_status:
                     fms = [x for x in user_forms if \
                             not x.formdef.private_status_and_history and \
                             x.formdef.workflow.id == workflow.id and \
                             (x.get_visible_status() == status)]
                     if not fms:
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-misc-remove-private-status-history-option-33155.patch