Projet

Général

Profil

0001-search-use-description-template-from-settings-for-us.patch

Benjamin Dauvergne, 11 novembre 2021 17:16

Télécharger (2,18 ko)

Voir les différences: 

Subject: [PATCH] search: use description template from settings for users
 (#58548)


 combo/apps/search/forms.py |  6 ++++++
 tests/test_search.py       | 10 ++++++++++
 2 files changed, 16 insertions(+)
combo/apps/search/forms.py
167 167 
    def __init__(self, *args, **kwargs):
168 168 
        self.engine_slug = kwargs.pop('engine_slug')
169 169 
        super().__init__(*args, **kwargs)
170 
        try:
171 
            users_engine_settings = engines.get('users')
172 
        except KeyError:
173 
            users_engine_settings = {}
174 
        if 'hit_description_template' in users_engine_settings:
175 
            self.fields['description_template'].initial = users_engine_settings['hit_description_template']
170 176 

  		




  171
  177
  
    
    def get_title(self):

  		




  172
  178
  
    
        return _('Update "Users" engine')

  		












  

    
      tests/test_search.py
    
  





  1149
  1149
  
    
        not in resp.text

  		




  1150
  1150
  
    
    )

  		




  1151
  1151
  
    

  		




  
  1152
  
    
    # check default value from settings is retained in configuration form

  		




  
  1153
  
    
    users_engine = engines.get('users').copy()

  		




  
  1154
  
    
    settings.COMBO_SEARCH_SERVICES = {'users': users_engine}

  		




  
  1155
  
    
    with mock.patch.dict(

  		




  
  1156
  
    
        users_engine, {'hit_description_template': users_engine['hit_description_template'] + ' xxx'}

  		




  
  1157
  
    
    ):

  		




  
  1158
  
    
        form_resp = resp.click(href='.*/search_searchcell-%s/engine/users/add/' % cell.pk)

  		




  
  1159
  
    
        assert form_resp.form['description_template'].value.endswith(' xxx')

  		




  
  1160
  
    

  		




  1152
  1161
  
    
    resp = resp.click(href='.*/search_searchcell-%s/engine/users/add/' % cell.pk)

  		




  1153
  1162
  
    
    resp.form['title'] = 'Custom Title'

  		




  
  1163
  
    
    assert not resp.form['description_template'].value.endswith(' xxx')

  		




  1154
  1164
  
    
    resp.form['description_template'] = 'Foo Bar'

  		




  1155
  1165
  
    
    resp = resp.form.submit('submit')

  		




  1156
  1166
  
    
    assert resp.status_int == 302

  		




  1157
  
  
    
-