diff options
Diffstat (limited to 'chimere/forms.py')
| -rw-r--r-- | chimere/forms.py | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/chimere/forms.py b/chimere/forms.py index e8a713d..2182a09 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -32,8 +32,7 @@ from django.utils.translation import ugettext as _ from django.contrib.auth.models import User, Permission, ContentType from django.core.mail import EmailMessage, BadHeaderError -if hasattr(settings, 'CHIMERE_SEARCH_ENGINE') and \ - settings.CHIMERE_SEARCH_ENGINE: +if getattr(settings, 'HAYSTACK_SEARCH_ENGINE', None): from haystack.forms import SearchForm as HaystackSearchForm from chimere.models import Marker, Route, PropertyModel, Area,\ @@ -373,8 +372,6 @@ class MarkerAdminFormBase(forms.ModelForm): choices[0][1]) self.fields['categories'].initial = \ [self.fields['categories'].choices[0][0]] - if not settings.CHIMERE_SEARCH_ENGINE and 'keywords' in self.fields: - self.fields.pop('keywords') if not settings.CHIMERE_DAYS_BEFORE_EVENT: self.fields.pop('start_date') self.fields.pop('end_date') @@ -446,8 +443,6 @@ class MarkerBaseForm(MarkerAdminFormBase): EXCLUDED_FIELDS = ['status'] -if not settings.CHIMERE_SEARCH_ENGINE: - EXCLUDED_FIELDS.append('keywords') class MarkerForm(MarkerBaseForm): @@ -519,8 +514,6 @@ class RouteAdminForm(forms.ModelForm): choices=self.fields['categories'].choices) return self.fields.pop('read_from_file') - if not settings.CHIMERE_SEARCH_ENGINE and 'keywords' in self.fields: - self.fields.pop('keywords') if settings.CHIMERE_DAYS_BEFORE_EVENT: self.fields['start_date'].widget = DatePickerWidget() self.fields['end_date'].widget = DatePickerWidget() @@ -869,10 +862,14 @@ class RoutingForm(forms.Form): self.fields['speed'].widget.choices.append( ("%s_%d" % (transport, speed), _(lbl))) + SearchForm = None -if hasattr(settings, 'CHIMERE_SEARCH_ENGINE') \ - and settings.CHIMERE_SEARCH_ENGINE: +if getattr(settings, 'HAYSTACK_SEARCH_ENGINE', None): class SearchForm(HaystackSearchForm): pass +else: + # TODO SEARCH + pass + |