Projet

Général

Profil

0001-wf-remove-trigger-from-jump-item-attached-to-global-.patch

Valentin Deniaud, 26 janvier 2021 15:38

Télécharger (2,06 ko)

Voir les différences: 

Subject: [PATCH] wf: remove trigger from jump item attached to global action
 (#11280)


 tests/admin_pages/test_workflow.py | 1 +
 wcs/wf/jump.py                     | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
tests/admin_pages/test_workflow.py
759 759 

  		




  760
  760
  
    
    resp = app.get('/backoffice/workflows/1/global-actions/ac1/items/_jump/')

  		




  761
  761
  
    
    assert 'Previously Marked Status' in [x[2] for x in resp.form['status'].options]

  		




  
  762
  
    
    assert 'trigger' not in resp.form.fields

  		




  762
  763
  
    

  		




  763
  764
  
    
    jump_global.set_marker_on_status = False

  		




  764
  765
  
    
    workflow.store()

  		












  

    
      wcs/wf/jump.py
    
  





  31
  31
  
    
from ..qommon.publisher import get_publisher_class

  		




  32
  32
  
    
from ..qommon.cron import CronJob

  		




  33
  33
  
    

  		




  34
  
  
    
from wcs.workflows import Workflow, WorkflowStatusJumpItem, register_item_class

  		




  
  34
  
    
from wcs.workflows import Workflow, WorkflowStatusJumpItem, WorkflowGlobalAction, register_item_class

  		




  35
  35
  
    
from wcs.api import get_user_from_api_query_string, is_url_signed

  		




  36
  36
  
    
from wcs.conditions import Condition

  		




  37
  37
  
    

  		




  ......




  171
  171
  
    
            return wf_status[0].name

  		




  172
  172
  
    

  		




  173
  173
  
    
    def get_parameters(self):

  		




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

  		




  
  174
  
    
        parameters = {'status', 'condition', 'trigger', 'by', 'timeout', 'set_marker_on_status'}

  		




  
  175
  
    
        if isinstance(self.parent, WorkflowGlobalAction):

  		




  
  176
  
    
            parameters.remove('trigger')

  		




  
  177
  
    
        return parameters

  		




  175
  178
  
    

  		




  176
  179
  
    
    def add_parameters_widgets(self, form, parameters, prefix='', formdef=None):

  		




  177
  180
  
    
        super(JumpWorkflowStatusItem, self).add_parameters_widgets(

  		




  178
  
  
    
-