Code cleanup

This commit is contained in:
Roberto Rosario
2011-07-21 11:46:15 -04:00
parent 46aa89d924
commit 90e876ca93
36 changed files with 125 additions and 169 deletions
+1 -1
View File
@@ -11,7 +11,7 @@ class SearchForm(forms.Form):
required=False,
widget=forms.widgets.HiddenInput()
)
class AdvancedSearchForm(forms.Form):
def __init__(self, *args, **kwargs):
+1 -2
View File
@@ -1,5 +1,4 @@
import urlparse
from datetime import datetime
from django.db import models
from django.utils.http import urlencode
@@ -12,7 +11,7 @@ class RecentSearchManager(models.Manager):
parsed_query = urlparse.parse_qs(query)
for key, value in parsed_query.items():
parsed_query[key] = u' '.join(value)
if 'q=' in query:
# Is a simple query
if not parsed_query.get('q'):
+4 -4
View File
@@ -10,7 +10,7 @@ from django.core.urlresolvers import reverse
from dynamic_search.managers import RecentSearchManager
from dynamic_search.api import registered_search_dict
class RecentSearch(models.Model):
"""
Keeps a list of the n most recent search keywords for a given user
@@ -46,15 +46,15 @@ class RecentSearch(models.Model):
def save(self, *args, **kwargs):
self.datetime_created = datetime.now()
super(RecentSearch, self).save(*args, **kwargs)
def url(self):
view = 'results' if self.is_advanced() else 'search'
return '%s?%s' % (reverse(view), self.query)
def is_advanced(self):
return 'q' not in urlparse.parse_qs(self.query)
class Meta:
ordering = ('-datetime_created',)
verbose_name = _(u'recent search')
verbose_name_plural = _(u'recent searches')
verbose_name_plural = _(u'recent searches')
+3 -3
View File
@@ -39,10 +39,10 @@ def results(request, extra_context=None):
if extra_context:
context.update(extra_context)
query = urlencode(dict(request.GET.items()))
if query:
RecentSearch.objects.add_query_for_user(request.user, query, response['result_count'])
RecentSearch.objects.add_query_for_user(request.user, query, response['result_count'])
context.update({
'found_entries': response['model_list'],
'object_list': response['flat_list'],