0001-backoffice-prefill-with-form-user-data-8940.patch

Frédéric Péters, 10 novembre 2015 17:23

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

Subject: [PATCH] backoffice: prefill with form user data (#8940)

 tests/test_backoffice_pages.py | 51 ++++++++++++++++++++++++++++++++++++++++--
 tests/test_prefill.py          |  4 ++--
 wcs/api.py                     |  1 +
 wcs/backoffice/management.py   | 10 +++++----
 wcs/fields.py                  |  5 ++---
 wcs/forms/root.py              | 14 +++++++-----
 wcs/wf/form.py                 | 12 +++++++++-
 7 files changed, 79 insertions(+), 18 deletions(-)

         assert not 'Channel' in resp.body
         number31.submission_channel = 'mail'
         number31.user_id = user.id
         number31.submission_context = {
                 'mail_url': 'http://www.example.com/test.pdf',
                 'thumbnail_url': 'http://www.example.com/thumbnail.png',
                 'user_id': user.id,
                 'comments': 'test_backoffice_submission_context',
                 'summary_url': 'http://www.example.com/summary',
+        }
-...
         assert 'Running submission' in resp.body
         assert '>#%s' % formdata.id in resp.body
     def test_backoffice_submission_prefill_user(pub):
         user = create_user(pub)
         create_environment(pub)
         other_user = pub.user_class(name='other user')
         other_user.email = 'other@example.net'
         other_user.store()
         formdef = FormDef.get_by_urlname('form-title')
         formdef.fields[0].prefill = {'type': 'user', 'value': 'email'}
         formdef.backoffice_submission_roles = user.roles[:]
         formdef.store()
         formdata = formdef.data_class()()
         formdata.backoffice_submission = True
         formdata.status = 'draft'
         formdata.data = {}
         formdata.submission_channel = 'mail'
         formdata.user_id = other_user.id
         formdata.submission_context = {}
         formdata.store()
         formdata2 = formdef.data_class()()
         formdata2.backoffice_submission = True
         formdata2.status = 'draft'
         formdata2.data = {}
         formdata.submission_channel = 'mail'
         formdata.user_id = None
         formdata2.submission_context = {}
         formdata2.store()
         app = login(get_app(pub))
         resp = app.get('/backoffice/submission/form-title/')
         assert resp.form['f1'].value == ''
         # restore a draft
         resp = app.get('/backoffice/submission/form-title/%s' % formdata.id)
         resp = resp.follow()
         # and check it got prefilled with the user from context
         assert resp.form['f1'].value == 'other@example.net'
         # restore another, without user id
         resp = app.get('/backoffice/submission/form-title/%s' % formdata2.id)
         resp = resp.follow()
         # and check it was not prefilled
         assert resp.form['f1'].value == ''
     def test_backoffice_submission_prefill_user_via_formula(pub):
         user = create_user(pub)
-...
         formdata.status = 'draft'
         formdata.data = {}
         formdata.submission_channel = 'mail'
         formdata.submission_context = {'user_id': other_user.id}
         formdata.user_id = other_user.id
         formdata.submission_context = {}
         formdata.store()
         formdata2 = formdef.data_class()()
-...
         formdata2.status = 'draft'
         formdata2.data = {}
         formdata.submission_channel = 'mail'
         formdata.user_id = None
         formdata2.submission_context = {}
         formdata2.store()

     import sys
     import shutil
     from quixote import cleanup
     from quixote import cleanup, get_request
     from wcs.qommon.http_request import HTTPRequest
     from wcs import fields
-...
         field = fields.Field()
         field.prefill = {'type': 'user', 'value': 'email'}
         assert field.get_prefill_value() == 'test@example.net'
         assert field.get_prefill_value(user=get_request().user) == 'test@example.net'
     def test_prefill_formula():

wcs/api.py
235	235	if json_input.get('context'):
236	236	formdata.submission_context = json_input['context']
237	237	formdata.submission_channel = formdata.submission_context.pop('channel', None)
	238	formdata.user_id = formdata.submission_context.pop('user_id', None)
238	239	formdata.store()
239	240	if self.formdef.enable_tracking_codes:
240	241	code = get_publisher().tracking_code_class()

                 if extra_context.get('mail_url'):
                     r += htmltext('<p><a href="%s">%s</a></p>') % (
                             extra_context.get('mail_url'), _('Open'))
                 if extra_context.get('user_id'):
                     r += htmltext('<h3>%s</h3>') % _('Associated User')
                     r += htmltext('<p>%s</p>') % get_publisher().user_class.get(
                             extra_context.get('user_id')).display_name
                 if extra_context.get('comments'):
                     r += htmltext('<h3>%s</h3>') % _('Comments')
                     r += htmltext('<p>%s</p>') % extra_context.get('comments')
-...
                             (extra_context.get('summary_url')))
                 r += htmltext('</div>')
             if formdata.user_id:
                 r += htmltext('<div class="extra-context">')
                 r += htmltext('<h3>%s</h3>') % _('Associated User')
                 r += htmltext('<p>%s</p>') % formdata.get_user().display_name
                 r += htmltext('</div>')
             if formdata.user_id and get_publisher().is_using_postgresql():
                 # display list of open formdata for the same user
                 user_roles = [logged_users_role().id] + (get_request().user.roles or [])

         def get_csv_value(self, element, hint=None):
             return []
         def get_prefill_value(self):
         def get_prefill_value(self, user=None):
             t = self.prefill.get('type')
             if t == 'string':
                 return self.prefill.get('value')
             elif t == 'user' and get_request().user:
             elif t == 'user' and user:
                 x = self.prefill.get('value')
                 user = get_request().user
                 if x == 'email':
                     return user.email
                 elif user.form_data:

                     if data.has_key(k):
                         v = data[k]
                     elif field.prefill:
                         v = field.get_prefill_value()
                         prefill_user = get_request().user
                         if get_request().is_in_backoffice():
                             prefill_user = get_publisher().substitutions.get_context_variables(
                                     ).get('form_user')
                         v = field.get_prefill_value(user=prefill_user)
                         if get_request().is_in_backoffice() and (
                                 field.prefill and field.prefill.get('type') in ('user', 'geoloc')):
                             # turn off prefilling from user and geolocation
                             # attributes if the form is filled from the backoffice
                                 field.prefill and field.prefill.get('type') == 'geoloc'):
                             # turn off prefilling from geolocation attributes if
                             # the form is filled from the backoffice
                             v = None
                         if v:
                             prefilled = True
-...
                 draft_formdata_id = formdata.data.get('draft_formdata_id')
                 if draft_formdata_id:
                     formdata = self.formdef.data_class().get(draft_formdata_id)
                     extra_context = formdata.submission_context or {}
                     formdata.user_id = extra_context.get('user_id')
             formdata.status = str('')
             get_publisher().substitutions.feed(formdata)

                     continue
                 if not field.prefill or field.prefill.get('type') == 'none':
                     continue
                 v = field.get_prefill_value()
                 # FIXME: this code duplicates code from wcs/forms/root.py :/
                 prefill_user = get_request().user
                 if get_request().is_in_backoffice():
                     prefill_user = get_publisher().substitutions.get_context_variables(
                             ).get('form_user')
                 v = field.get_prefill_value(user=prefill_user)
                 if get_request().is_in_backoffice() and (
                         field.prefill and field.prefill.get('type') == 'geoloc'):
                     # turn off prefilling from geolocation attributes if
                     # the form is filled from the backoffice
                     v = None
                 if v:
                     form.get_widget('f%s' % field.id).set_value(v)
                     req.form['f%s' % field.id] = v
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-backoffice-prefill-with-form-user-data-8940.patch