Adv search now redirects to a cleaner results view with a 'search again' button, PEP8 cleanups, removed reduntant code
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
from django import forms
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from dynamic_search.api import registered_search_dict
|
||||
|
||||
|
||||
class SearchForm(forms.Form):
|
||||
q = forms.CharField(max_length=128, label=_(u'Search terms'))
|
||||
@@ -8,12 +10,11 @@ class SearchForm(forms.Form):
|
||||
|
||||
class AdvancedSearchForm(forms.Form):
|
||||
def __init__(self, *args, **kwargs):
|
||||
search_fields = kwargs.pop('search_fields')
|
||||
super(AdvancedSearchForm, self).__init__(*args, **kwargs)
|
||||
|
||||
#Set form fields initial values
|
||||
for search_field in search_fields:
|
||||
self.fields[search_field['name']] = forms.CharField(
|
||||
label=search_field['title'],
|
||||
required=False
|
||||
)
|
||||
for model_name, values in registered_search_dict.items():
|
||||
for field in values['fields']:
|
||||
self.fields['%s__%s' % (model_name, field['name'])] = forms.CharField(
|
||||
label=field['title'],
|
||||
required=False
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user