0001-workflows-ignore-reordering-with-unknown-action-ids-.patch

Frédéric Péters, 20 décembre 2021 12:11

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

Subject: [PATCH] workflows: ignore reordering with unknown action ids (#59898)

 tests/admin_pages/test_workflow.py | 41 +++++++++++++++++++++
 wcs/admin/workflows.py             | 59 +++++++++++++++++-------------
 wcs/workflows.py                   |  5 +--
 3 files changed, 76 insertions(+), 29 deletions(-)

             resp = resp.follow()  # redirect to ./
     def test_workflows_status_reorder_actions(pub):
         create_superuser(pub)
         Workflow.wipe()
         workflow = Workflow(name='foo')
         st1 = workflow.add_status(name='baz')
         choice1 = st1.append_item('choice')
         choice1.by = ['logged-users']
         choice1.status = 'wf-%s' % st1.id
         choice1.label = 'choice1'
         choice2 = st1.append_item('choice')
         choice2.by = ['logged-users']
         choice2.status = 'wf-%s' % st1.id
         choice2.label = 'choice2'
         workflow.store()
         app = login(get_app(pub))
         resp = app.get('/backoffice/workflows/%s/status/%s/' % (workflow.id, st1.id))
         assert resp.text.index('choice1') < resp.text.index('choice2')
         resp = app.get(
             '/backoffice/workflows/%s/status/%s/update_order?order=%s;%s;'
             % (workflow.id, st1.id, choice1.id, choice2.id)
+        )
         assert resp.json == {'err': 0}
         resp = app.get(
             '/backoffice/workflows/%s/status/%s/update_order?order=%s;%s;'
             % (workflow.id, st1.id, choice2.id, choice1.id)
+        )
         assert resp.json == {'err': 0}
         resp = app.get('/backoffice/workflows/%s/status/%s/' % (workflow.id, st1.id))
         assert resp.text.index('choice2') < resp.text.index('choice1')
         resp = app.get(
             '/backoffice/workflows/%s/status/%s/update_order?order=%s;%s;' % (workflow.id, st1.id, '123', '456')
         )  # invalid action id
         assert resp.json == {'err': 1}
     def test_workflows_edit_dispatch_action(pub):
         create_superuser(pub)
         pub.role_class.wipe()

     # along with this program; if not, see <http://www.gnu.org/licenses/>.
     import io
     import json
     import textwrap
     import time
     import xml.etree.ElementTree as ET
-...
         return get_publisher().get_backoffice_root().is_global_accessible('workflows')
     def update_order(elements):
         request = get_request()
         new_order = request.form['order'].strip(';').split(';')
         new_elements = []
         for y in new_order:
             element = [x for x in elements if x.id == y]
             if not element:
                 continue
             new_elements.append(element[0])
         if {element.id for element in new_elements} != {element.id for element in elements}:
             return None
         return new_elements
     def svg(tag):
         return '{http://www.w3.org/2000/svg}%s' % tag
-...
             return form
         def update_order(self):
             request = get_request()
             new_order = request.form['order'].strip(';').split(';')
             self.status.items = [[x for x in self.status.items if x.id == y][0] for y in new_order]
             get_response().set_content_type('application/json')
             reordered_items = update_order(self.status.items)
             if reordered_items is None:
                 return json.dumps({'err': 1})
             self.status.items = reordered_items
             self.workflow.store(comment=_('Change in action order'))
             return 'ok'
             return json.dumps({'err': 0})
         def newitem(self):
             form = self.get_new_item_form()
-...
             r += htmltext('</div>')
             return r.getvalue()
         def _update_order(self, elements):
             request = get_request()
             new_order = request.form['order'].strip(';').split(';')
             new_elements = []
             for y in new_order:
                 status = [x for x in elements if x.id == y]
                 if not status:
                     continue
                 new_elements.append(status[0])
             if {s.id for s in new_elements} != {s.id for s in elements}:
                 return None
             return new_elements
         def update_order(self):
             new_possible_status = self._update_order(self.workflow.possible_status)
             get_response().set_content_type('application/json')
             new_possible_status = update_order(self.workflow.possible_status)
             if new_possible_status is None:
                 return 'ko'
                 return json.dumps({'err': 1})
             self.workflow.possible_status = new_possible_status
             self.workflow.store(comment=_('Change in status order'))
             return 'ok'
             return json.dumps({'err': 0})
         def update_actions_order(self):
             new_global_actions = self._update_order(self.workflow.global_actions)
             get_response().set_content_type('application/json')
             new_global_actions = update_order(self.workflow.global_actions)
             if new_global_actions is None:
                 return 'ko'
                 return json.dumps({'err': 1})
             self.workflow.global_actions = new_global_actions
             self.workflow.store(comment=_('Change in global actions order'))
             return 'ok'
             return json.dumps({'err': 0})
         def update_criticality_levels_order(self):
             new_criticality_levels = self._update_order(self.workflow.criticality_levels)
             get_response().set_content_type('application/json')
             new_criticality_levels = update_order(self.workflow.criticality_levels)
             if new_criticality_levels is None:
                 return 'ko'
                 return json.dumps({'err': 1})
             self.workflow.criticality_levels = new_criticality_levels
             self.workflow.store(comment=_('Change in criticality levels order'))
             return 'ok'
             return json.dumps({'err': 0})
         def newstatus(self):
             form = Form(enctype='multipart/form-data', action='newstatus')

                     else:
                         o.id = '1'
                     self.items.append(o)
                     break
             else:
                 raise KeyError()
                     return o
             raise KeyError()
         def get_item(self, id):
             for item in self.items:
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-workflows-ignore-reordering-with-unknown-action-ids-.patch