matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add from __future__ import unicode_literals, issue #37

Browse Source
This commit is contained in:
Roberto Rosario
2015-01-19 04:06:40 -04:00
parent efbac7300c
commit d59ea3ede2
334 changed files with 2452 additions and 2268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mayan/apps/dynamic_search/models.py
+10 -10
View File
@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import unicode_literals
import urllib
import urlparse
@@ -16,15 +16,15 @@ class RecentSearch(models.Model):
"""
Keeps a list of the n most recent search keywords for a given user
"""
user = models.ForeignKey(User, verbose_name=_(u'User'), editable=True)
user = models.ForeignKey(User, verbose_name=_('User'), editable=True)
# Setting editable to True to workaround Django REST framework issue
# 1604 - https://github.com/tomchristie/django-rest-framework/issues/1604
# Should be fixed by DRF v2.4.4
# TODO: Fix after upgrade to DRF v2.4.4
query = models.TextField(verbose_name=_(u'Query'), editable=False)
datetime_created = models.DateTimeField(verbose_name=_(u'Datetime created'), auto_now=True, db_index=True)
hits = models.IntegerField(verbose_name=_(u'Hits'), editable=False)
query = models.TextField(verbose_name=_('Query'), editable=False)
datetime_created = models.DateTimeField(verbose_name=_('Datetime created'), auto_now=True, db_index=True)
hits = models.IntegerField(verbose_name=_('Hits'), editable=False)
objects = RecentSearchManager()
@@ -40,14 +40,14 @@ class RecentSearch(models.Model):
advanced_string = []
for key, value in query_dict.items():
search_field = document_search.get_search_field(key)
advanced_string.append(u'%s: %s' % (search_field.label, smart_unicode(' '.join(value))))
advanced_string.append('%s: %s' % (search_field.label, smart_unicode(' '.join(value))))
display_string = u', '.join(advanced_string)
display_string = ', '.join(advanced_string)
else:
# Is a simple search
display_string = smart_unicode(' '.join(query_dict['q']))
return u'%s (%s)' % (display_string, self.hits)
return '%s (%s)' % (display_string, self.hits)
def save(self, *args, **kwargs):
super(RecentSearch, self).save(*args, **kwargs)
@@ -61,5 +61,5 @@ class RecentSearch(models.Model):
class Meta:
ordering = ('-datetime_created',)
verbose_name = _(u'Recent search')
verbose_name_plural = _(u'Recent searches')
verbose_name = _('Recent search')
verbose_name_plural = _('Recent searches')