Projet

Général

Profil

0001-misc-add-property-to-get-submission-agent-34708.patch

Frédéric Péters, 28 mars 2020 17:54

Télécharger (2,42 ko)

Voir les différences: 

Subject: [PATCH] misc: add property to get submission agent (#34708)


 tests/test_formdata.py | 5 ++++-
 wcs/variables.py       | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
tests/test_formdata.py
110 110 
    assert substvars.get('form_number_raw') == str(formdata.id)
111 111 

  		




  112
  112
  
    

  		




  113
  
  
    
def test_submission_context(pub):

  		




  
  113
  
    
def test_submission_context(pub, local_user):

  		




  114
  114
  
    
    formdef.data_class().wipe()

  		




  115
  115
  
    
    formdata = formdef.data_class()()

  		




  116
  116
  
    
    formdata.backoffice_submission = True

  		




  117
  117
  
    
    formdata.submission_channel = 'mail'

  		




  118
  118
  
    
    formdata.submission_context = {

  		




  119
  119
  
    
        'mail_url': 'http://www.example.com/test.pdf',

  		




  
  120
  
    
        'agent_id': local_user.id,

  		




  120
  121
  
    
    }

  		




  121
  122
  
    
    substvars = formdata.get_substitution_variables()

  		




  122
  123
  
    
    assert substvars.get('form_submission_backoffice') is True

  		




  123
  124
  
    
    assert substvars.get('form_submission_channel') == 'mail'

  		




  124
  125
  
    
    assert substvars.get('form_submission_channel_label') == 'Mail'

  		




  125
  126
  
    
    assert substvars.get('form_submission_context_mail_url') == 'http://www.example.com/test.pdf'

  		




  
  127
  
    
    assert substvars.get('form_submission_agent_email') == local_user.email

  		




  126
  128
  
    

  		




  127
  129
  
    
    formdata = formdef.data_class()()

  		




  128
  130
  
    
    substvars = formdata.get_substitution_variables()

  		




  129
  131
  
    
    assert substvars.get('form_submission_backoffice') is False

  		




  130
  132
  
    
    assert substvars.get('form_submission_channel') is None

  		




  131
  133
  
    
    assert substvars.get('form_submission_channel_label') == 'Web'

  		




  
  134
  
    
    assert substvars.get('form_submission_agent_email') is None

  		




  132
  135
  
    

  		




  133
  136
  
    

  		




  134
  137
  
    
def test_just_created(pub):

  		












  

    
      wcs/variables.py
    
  





  313
  313
  
    
    def submission_channel_label(self):

  		




  314
  314
  
    
        return self._formdata.get_submission_channel_label()

  		




  315
  315
  
    

  		




  
  316
  
    
    @property

  		




  
  317
  
    
    def submission_agent(self):

  		




  
  318
  
    
        try:

  		




  
  319
  
    
            return LazyUser(get_publisher().user_class.get(self._formdata.submission_context['agent_id']))

  		




  
  320
  
    
        except (TypeError, KeyError):

  		




  
  321
  
    
            return None

  		




  
  322
  
    

  		




  316
  323
  
    
    @property

  		




  317
  324
  
    
    def submission_context(self):

  		




  318
  325
  
    
        return self._formdata.submission_context

  		




  319
  
  
    
-