Projet

Général

Profil

0004-workflows-factorize-code-evaluating-workflow-form-35.patch

Nicolas Roche, 19 septembre 2019 17:14

Télécharger (2,28 ko)

Voir les différences:

Subject: [PATCH 4/5] workflows: factorize code evaluating workflow form
 (#35903)

 wcs/forms/common.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)
wcs/forms/common.py
260 260
                templates=list(self.get_formdef_template_variants(self.status_templates)),
261 261
                context=context)
262 262

  
263
    def get_workflow_form(self, user):
263
    def evaluate_workflow_form(self, user):
264 264
        displayed_fields = []
265 265
        form = self.filled.get_workflow_form(user, displayed_fields=displayed_fields)
266 266
        self.filled.evaluate_live_workflow_form(user, form)
......
269 269
        # reevaluate workflow form according to possible new content
270 270
        displayed_fields = []
271 271
        form = self.filled.get_workflow_form(user, displayed_fields=displayed_fields)
272
        return form, displayed_fields
273

  
274
    def get_workflow_form(self, user):
275
        form, displayed_fields = self.evaluate_workflow_form(user)
272 276
        if form:
273 277
            form.attrs['data-live-url'] = self.filled.get_url() + 'live'
274 278
        if form and form.is_submitted():
......
681 685
            return result_error('missing session')
682 686

  
683 687
        user = get_request().user
684
        displayed_fields = []
685
        form = self.filled.get_workflow_form(user, displayed_fields=displayed_fields)
686
        self.filled.evaluate_live_workflow_form(user, form)
687
        get_publisher().substitutions.unfeed(lambda x: x is self.filled)
688
        get_publisher().substitutions.feed(self.filled)
689
        # reevaluate workflow form according to possible new content
690
        displayed_fields = []
691
        form = self.filled.get_workflow_form(user, displayed_fields=displayed_fields)
688
        form, displayed_fields = self.evaluate_workflow_form(user)
692 689
        return self.live_process_fields(form, self.filled, displayed_fields)
693 690

  
694 691
    def _q_lookup(self, component):
695
-