Projet

Général

Profil

0001-workflows-remove-timeout-roles-options-for-jump-used.patch

Frédéric Péters, 07 août 2022 10:28

Télécharger (1,94 ko)

Voir les différences: 

Subject: [PATCH] workflows: remove timeout/roles options for jump used in
 global action (#68002)


 tests/admin_pages/test_workflow.py | 16 ++++++++++++++++
 wcs/wf/jump.py                     |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
tests/admin_pages/test_workflow.py
1304 1304 
        assert not resp.pyquery.find('.jump a')
1305 1305 

  		




  1306
  1306
  
    

  		




  
  1307
  
    
def test_workflows_edit_jump_in_global_action(pub):

  		




  
  1308
  
    
    create_superuser(pub)

  		




  
  1309
  
    

  		




  
  1310
  
    
    Workflow.wipe()

  		




  
  1311
  
    
    workflow = Workflow(name='foo')

  		




  
  1312
  
    
    ac1 = workflow.add_global_action('Action', 'ac1')

  		




  
  1313
  
    
    jump = ac1.add_action('jump', id='_jump')

  		




  
  1314
  
    
    workflow.store()

  		




  
  1315
  
    

  		




  
  1316
  
    
    app = login(get_app(pub))

  		




  
  1317
  
    
    resp = app.get(jump.get_admin_url())

  		




  
  1318
  
    
    assert 'by' not in resp.form.fields

  		




  
  1319
  
    
    assert 'timeout' not in resp.form.fields

  		




  
  1320
  
    
    resp = resp.form.submit('submit')

  		




  
  1321
  
    

  		




  
  1322
  
    

  		




  1307
  1323
  
    
def test_workflows_edit_sms_action(pub):

  		




  1308
  1324
  
    
    create_superuser(pub)

  		




  1309
  1325
  
    
    Workflow.wipe()

  		












  

    
      wcs/wf/jump.py
    
  





  183
  183
  
    

  		




  184
  184
  
    
    def get_parameters(self):

  		




  185
  185
  
    
        if hasattr(self, 'parent') and isinstance(self.parent, WorkflowGlobalAction):

  		




  186
  
  
    
            return ('status', 'condition', 'by', 'timeout', 'set_marker_on_status')

  		




  
  186
  
    
            return ('status', 'condition', 'set_marker_on_status')

  		




  187
  187
  
    
        return ('status', 'condition', 'trigger', 'by', 'timeout', 'set_marker_on_status')

  		




  188
  188
  
    

  		




  189
  189
  
    
    def add_parameters_widgets(self, form, parameters, prefix='', formdef=None, **kwargs):

  		




  190
  
  
    
-