Projet

Général

Profil

0001-misc-add-COMBO_SEARCH_SERVICES-to-default-settings-1.patch

Frédéric Péters, 23 avril 2017 16:11

Télécharger (2,66 ko)

Voir les différences: 

Subject: [PATCH] misc: add COMBO_SEARCH_SERVICES to default settings (#15929)


 combo/apps/search/models.py | 2 +-
 combo/data/models.py        | 1 +
 combo/settings.py           | 3 +++
 tests/test_manager.py       | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)
combo/apps/search/models.py
47 47 
        search_services = [(None, _('Not configured'))]
48 48 
        search_services.append(('_text', _('Page Contents')))
49 49 
        search_services.extend([(code, service['label'])
50 
                for code, service in getattr(settings, 'COMBO_SEARCH_SERVICES', {}).items()])
50 
                for code, service in settings.COMBO_SEARCH_SERVICES.items()])
51 51 
        widgets = {'_search_service': Select(choices=search_services)}
52 52 
        return model_forms.modelform_factory(self.__class__,
53 53 
                fields=['_search_service'],
combo/data/models.py
87 87 
    order = models.PositiveIntegerField()
88 88 
    exclude_from_navigation = models.BooleanField(_('Exclude from navigation'), default=False)
89 89 
    redirect_url = models.CharField(_('Redirect URL'), max_length=200, blank=True)
90 
    #image = models.ImageField(_('Picture'), upload_to='images/', max_width=300, null=True)
90 91 

  		




  91
  92
  
    
    public = models.BooleanField(_('Public'), default=True)

  		




  92
  93
  
    
    groups = models.ManyToManyField(Group, verbose_name=_('Groups'), blank=True)

  		












  

    
      combo/settings.py
    
  





  262
  262
  
    

  		




  263
  263
  
    
MELLON_IDENTITY_PROVIDERS = []

  		




  264
  264
  
    

  		




  
  265
  
    
# search services

  		




  
  266
  
    
COMBO_SEARCH_SERVICES = {}

  		




  
  267
  
    

  		




  265
  268
  
    
# mapping of payment modes

  		




  266
  269
  
    
LINGO_NO_ONLINE_PAYMENT_REASONS = {}

  		




  267
  270
  
    

  		












  

    
      tests/test_manager.py
    
  





  306
  306
  
    
    def __enter__(self):

  		




  307
  307
  
    
        settings.COMBO_SEARCH_SERVICES = self.search_services

  		




  308
  308
  
    
    def __exit__(self, *args, **kwargs):

  		




  309
  
  
    
        delattr(settings, 'COMBO_SEARCH_SERVICES')

  		




  
  309
  
    
        settings.COMBO_SEARCH_SERVICES = {}

  		




  310
  310
  
    

  		




  311
  311
  
    
def test_search_cell(app, admin_user):

  		




  312
  312
  
    
    Page.objects.all().delete()

  		




  313
  
  
    
-