0002-misc-add-parent-variable-to-lazy-formdata-39803.patch

Benjamin Dauvergne, 31 mars 2020 18:34

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

Subject: [PATCH 2/2] misc: add parent variable to lazy formdata (#39803)

 tests/test_backoffice_pages.py |  3 ++-
 tests/test_formdata.py         | 33 +++++++++++++++++++++++++++++++++
 wcs/backoffice/management.py   |  5 +++++
 wcs/qommon/substitution.py     |  5 +++++
 wcs/variables.py               | 25 ++++++++++++++++++++++++-
 wcs/wf/create_formdata.py      |  2 +-
 6 files changed, 70 insertions(+), 3 deletions(-)

         get_publisher().substitutions.feed(formdata)
         substvars = get_publisher().substitutions.get_context_variables(mode='lazy')
         assert str(substvars['form_links_resubmitted_form_var_foo_string']) == 'coucou'
         assert 'form_links_resubmitted_form_var_foo_string' in substvars.get_flat_keys()
         assert 'form_links_resubmitted' in substvars.get_flat_keys()
         assert 'form_links_resubmitted_form_var_foo_string' not in substvars.get_flat_keys()
     def test_backoffice_create_formdata_map_fields_by_varname(create_formdata):

         assert formdef.data_class().get(formdata.id).user_id is None
         assert formdef.data_class().get(formdata.id).user_label == 'blah xxx'
         assert formdef.data_class().get(formdata.id).get_user_label() == 'blah xxx'
     def test_form_parent(pub):
         formdef = FormDef()
         formdef.name = 'foobar'
         formdef.fields = [fields.StringField(id='0', label='foo', varname='foo')]
         formdef.store()
         parent = formdef.data_class()()
         parent.data = {'0': 'hello'}
         parent.store()
         child = formdef.data_class()()
         child.data = {'0': 'world'}
         child.submission_context = {
             'orig_formdef_id': formdef.id,
             'orig_formdata_id': parent.id,
+        }
         variables = parent.get_substitution_variables()
         assert variables.get('form_var_foo') == 'hello'
         assert variables.get('form_parent') is None
         assert str(variables['form'].var.foo) == 'hello'
         assert variables['form'].parent is None
         variables = child.get_substitution_variables()
         assert variables.get('form_var_foo') == 'world'
         assert variables.get('form_parent_form_var_foo') == 'hello'
         assert variables.get('form_parent') is not None
         assert str(variables['form'].var.foo) == 'world'
         assert str(variables['form'].parent['form'].var.foo) == 'hello'
         assert variables['form'].parent is not None

                     r += htmltext('  <div class="value"><span>%s</span>') % v
                 elif isinstance(v, (types.FunctionType, types.MethodType)):
                     continue
                 elif hasattr(v, 'inspect_url') and getattr(v, '_formdata', None) != self.filled:
                     html = v.inspect_url()
                     if html:
                         r += htmltext('<li><code title="%s">%s</code>') % (k, k)
                         r += htmltext('  <div class="value"><span>%s</span>') % html
                 elif hasattr(v, 'inspect_keys') or isinstance(v, dict):
                     # skip expanded
                     continue

             except KeyError:
                 return False
             return True
         def inspect_url(self):
             if 'form' in self and hasattr(self['form'], 'inspect_url'):
                 return self['form'].inspect_url()
             return None

     from django.utils.functional import SimpleLazyObject
     from quixote import get_publisher, get_request
     from quixote.html import htmltext
     from pyproj import Geod
-...
     from .qommon.templatetags.qommon import parse_datetime
     from .qommon.storage import (Or, Equal, NotEqual)
     from .formdef import FormDef
     class LazyFormDefObjectsManager(object):
         def __init__(self, formdef, formdata=None, criterias=None, order_by=None):
-...
                 if key[0] == '_' or key in blacklist:
                     continue
                 if key == 'parent':
                     yield key, False  # = recurse
                     if self.parent:  # hide parent when it's None
                         yield key, False  # = do not recurse
                 else:
                     yield key
-...
             return LazyFormDataLinks(self._formdata)
         @property
         def parent(self):
             if not self._formdata.submission_context:
                 return None
             if 'orig_formdef_id' not in self._formdata.submission_context:
                 return None
             if 'orig_formdata_id' not in self._formdata.submission_context:
                 return None
             formdef = FormDef.get(self._formdata.submission_context['orig_formdef_id'], ignore_errors=True)
             if formdef is None:
                 return None
             formdata = formdef.data_class().get(self._formdata.submission_context['orig_formdata_id'], ignore_errors=True)
             if formdata is None:
                 return None
             return formdata.get_substitution_variables()
         def export_to_json(self, include_files=True):
             # this gets used to generate an email attachment :/
             return self._formdata.export_to_json(include_files=include_files)
-...
                             return self._formdata.data.get(field.id)
                 raise
         def inspect_url(self):
             return htmltext('<a href="%sinspect">%s</a>') % (self.backoffice_url, self.display_name)
     class LazyFormDataVar(object):
         def __init__(self, fields, data, formdata=None):

         def inspect_keys(self):
             for part in self._formdata.iter_evolution_parts():
                 if isinstance(part, LinkedFormdataEvolutionPart) and part.varname:
                     yield part.varname
                     yield part.varname, False  # = do not recurse
     class CreateFormdataWorkflowStatusItem(WorkflowStatusItem):
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0002-misc-add-parent-variable-to-lazy-formdata-39803.patch