0001-misc-add-COMBO_SEARCH_SERVICES-to-default-settings-1.patch
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/settings.py | ||
---|---|---|
263 | 263 | |
264 | 264 |
MELLON_IDENTITY_PROVIDERS = [] |
265 | 265 | |
266 |
# search services |
|
267 |
COMBO_SEARCH_SERVICES = {} |
|
268 | ||
266 | 269 |
# mapping of payment modes |
267 | 270 |
LINGO_NO_ONLINE_PAYMENT_REASONS = {} |
268 | 271 |
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 |
- |