From 04d73c9010d33f966703fd1fdfeeea1f83f460e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 23 Apr 2017 16:11:19 +0200 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(-) diff --git a/combo/apps/search/models.py b/combo/apps/search/models.py index 6a42111..fb07a93 100644 --- a/combo/apps/search/models.py +++ b/combo/apps/search/models.py @@ -47,7 +47,7 @@ class SearchCell(CellBase): search_services = [(None, _('Not configured'))] search_services.append(('_text', _('Page Contents'))) search_services.extend([(code, service['label']) - for code, service in getattr(settings, 'COMBO_SEARCH_SERVICES', {}).items()]) + for code, service in settings.COMBO_SEARCH_SERVICES.items()]) widgets = {'_search_service': Select(choices=search_services)} return model_forms.modelform_factory(self.__class__, fields=['_search_service'], diff --git a/combo/data/models.py b/combo/data/models.py index 2e7bd00..ada5484 100644 --- a/combo/data/models.py +++ b/combo/data/models.py @@ -87,6 +87,7 @@ class Page(models.Model): order = models.PositiveIntegerField() exclude_from_navigation = models.BooleanField(_('Exclude from navigation'), default=False) redirect_url = models.CharField(_('Redirect URL'), max_length=200, blank=True) + #image = models.ImageField(_('Picture'), upload_to='images/', max_width=300, null=True) public = models.BooleanField(_('Public'), default=True) groups = models.ManyToManyField(Group, verbose_name=_('Groups'), blank=True) diff --git a/combo/settings.py b/combo/settings.py index 6e1eaae..c3bd24d 100644 --- a/combo/settings.py +++ b/combo/settings.py @@ -262,6 +262,9 @@ MELLON_USERNAME_TEMPLATE = '{attributes[name_id_content]}' MELLON_IDENTITY_PROVIDERS = [] +# search services +COMBO_SEARCH_SERVICES = {} + # mapping of payment modes LINGO_NO_ONLINE_PAYMENT_REASONS = {} diff --git a/tests/test_manager.py b/tests/test_manager.py index 885aa05..2c7c73a 100644 --- a/tests/test_manager.py +++ b/tests/test_manager.py @@ -306,7 +306,7 @@ class SearchServices(object): def __enter__(self): settings.COMBO_SEARCH_SERVICES = self.search_services def __exit__(self, *args, **kwargs): - delattr(settings, 'COMBO_SEARCH_SERVICES') + settings.COMBO_SEARCH_SERVICES = {} def test_search_cell(app, admin_user): Page.objects.all().delete() -- 2.11.0