Projet

Général

Profil

0001-workflows-allow-None-in-file-backoffice-fields-13783.patch

Thomas Noël, 28 octobre 2016 12:07

Télécharger (2,21 ko)

Voir les différences: 

Subject: [PATCH] workflows: allow None in file backoffice fields (#13783)


 tests/test_workflows.py     | 18 +++++++++++++++---
 wcs/wf/backoffice_fields.py |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)
tests/test_workflows.py
1922 1922 
    formdef.workflow_id = wf.id
1923 1923 
    formdef.store()
1924 1924 

  		




  
  1925
  
    
    item = SetBackofficeFieldsWorkflowStatusItem()

  		




  
  1926
  
    
    item.parent = st1

  		




  
  1927
  
    
    item.fields = [{'field_id': 'bo1', 'value': '=locals().get("form_var_file_raw")'}]

  		




  
  1928
  
    

  		




  
  1929
  
    
    # the file does not exist

  		




  
  1930
  
    
    formdata = formdef.data_class()()

  		




  
  1931
  
    
    formdata.data = {}

  		




  
  1932
  
    
    formdata.just_created()

  		




  
  1933
  
    
    formdata.store()

  		




  
  1934
  
    
    pub.substitutions.feed(formdata)

  		




  
  1935
  
    
    item.perform(formdata)

  		




  
  1936
  
    
    formdata = formdef.data_class().get(formdata.id)

  		




  
  1937
  
    
    assert formdata.data['bo1'] == None

  		




  
  1938
  
    

  		




  
  1939
  
    
    # store a PiclableUpload

  		




  1925
  1940
  
    
    upload = PicklableUpload('test.jpeg', 'image/jpeg')

  		




  1926
  1941
  
    
    upload.receive([open(os.path.join(os.path.dirname(__file__), 'image-with-gps-data.jpeg')).read()])

  		




  1927
  1942
  
    

  		




  ......




  1931
  1946
  
    
    formdata.store()

  		




  1932
  1947
  
    

  		




  1933
  1948
  
    
    pub.substitutions.feed(formdata)

  		




  1934
  
  
    
    item = SetBackofficeFieldsWorkflowStatusItem()

  		




  1935
  
  
    
    item.parent = st1

  		




  1936
  
  
    
    item.fields = [{'field_id': 'bo1', 'value': '=form_var_file_raw'}]

  		




  1937
  1949
  
    
    item.perform(formdata)

  		




  1938
  1950
  
    

  		




  1939
  1951
  
    
    formdata = formdef.data_class().get(formdata.id)

  		












  

    
      wcs/wf/backoffice_fields.py
    
  





  127
  127
  
    
                continue

  		




  128
  128
  
    

  		




  129
  129
  
    
            try:

  		




  130
  
  
    
                if formdef_field.type == 'file':

  		




  
  130
  
    
                if formdef_field.type == 'file' and new_value is not None:

  		




  131
  131
  
    
                    new_value = self.get_file_value(new_value)

  		




  132
  132
  
    
            except ValueError:

  		




  133
  133
  
    
                get_publisher().notify_of_exception(sys.exc_info())

  		




  134
  
  
    
-