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/__init__.py
+1 -1
View File
@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import unicode_literals
from navigation.api import register_links
from rest_api.classes import APIEndPoint
mayan/apps/dynamic_search/admin.py
+1 -1
View File
@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import unicode_literals
from django.contrib import admin
mayan/apps/dynamic_search/api.py
+5 -5
View File
@@ -1,6 +1,6 @@
# original code from:
# http://www.julienphalip.com/blog/2008/08/16/adding-search-django-site-snap/
from __future__ import absolute_import
from __future__ import unicode_literals
import datetime
import re
@@ -41,11 +41,11 @@ def get_query(terms, search_fields):
or_query = None
for field in search_fields:
if isinstance(field, types.StringTypes):
comparison = u'icontains'
comparison = 'icontains'
field_name = field
elif isinstance(field, types.DictType):
comparison = field.get('comparison', u'icontains')
field_name = field.get('field_name', u'')
comparison = field.get('comparison', 'icontains')
field_name = field.get('field_name', '')
if field_name:
q = Q(**{'%s__%s' % (field_name, comparison): term})
@@ -69,7 +69,7 @@ def perform_search(query_string, field_list=None):
search_dict = {}
if query_string:
simple_query_string = query_string.get('q', u'').strip()
simple_query_string = query_string.get('q', '').strip()
if simple_query_string:
for model, values in registered_search_dict.items():
search_dict.setdefault(values['model'], {'query_entries': [], 'title': values['title']})
mayan/apps/dynamic_search/api_views.py
+1 -1
View File
@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import unicode_literals
from rest_framework import generics
from rest_framework.exceptions import ParseError
mayan/apps/dynamic_search/classes.py
+2 -2
View File
@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import absolute_import, unicode_literals
import datetime
import logging
@@ -98,7 +98,7 @@ class SearchModel(object):
search_dict[search_field.get_model()]['searches'].append(
{
'field_name': [search_field.field],
'terms': self.normalize_query(query_string.get('q', u'').strip())
'terms': self.normalize_query(query_string.get('q', '').strip())
}
)
else:
mayan/apps/dynamic_search/forms.py
+2 -2
View File
@@ -1,11 +1,11 @@
from __future__ import absolute_import
from __future__ import unicode_literals
from django import forms
from django.utils.translation import ugettext_lazy as _
class SearchForm(forms.Form):
q = forms.CharField(max_length=128, label=_(u'Search terms'))
q = forms.CharField(max_length=128, label=_('Search terms'))
source = forms.CharField(
max_length=32,
required=False,
mayan/apps/dynamic_search/links.py
+5 -3
View File
@@ -1,5 +1,7 @@
from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
search = {'text': _(u'Search'), 'view': 'search:search', 'famfam': 'zoom'}
search_advanced = {'text': _(u'Advanced search'), 'view': 'search:search_advanced', 'famfam': 'zoom_in'}
search_again = {'text': _(u'Search again'), 'view': 'search:search_again', 'famfam': 'arrow_undo'}
search = {'text': _('Search'), 'view': 'search:search', 'famfam': 'zoom'}
search_advanced = {'text': _('Advanced search'), 'view': 'search:search_advanced', 'famfam': 'zoom_in'}
search_again = {'text': _('Search again'), 'view': 'search:search_again', 'famfam': 'arrow_undo'}
mayan/apps/dynamic_search/managers.py
-2
View File
@@ -1,5 +1,3 @@
from __future__ import absolute_import
import urlparse
from django.contrib.auth.models import AnonymousUser
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')
mayan/apps/dynamic_search/serializers.py
+1 -1
View File
@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import unicode_literals
from rest_framework import serializers
mayan/apps/dynamic_search/settings.py
+6 -6
View File
@@ -1,15 +1,15 @@
"""Configuration options for the dynamic_search app"""
from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
from smart_settings.api import register_settings
register_settings(
namespace=u'dynamic_search',
module=u'dynamic_search.settings',
namespace='dynamic_search',
module='dynamic_search.settings',
settings=[
{'name': u'SHOW_OBJECT_TYPE', 'global_name': u'SEARCH_SHOW_OBJECT_TYPE', 'default': True, 'hidden': True},
{'name': u'LIMIT', 'global_name': u'SEARCH_LIMIT', 'default': 100, 'description': _(u'Maximum amount search hits to fetch and display.')},
{'name': u'RECENT_COUNT', 'global_name': u'SEARCH_RECENT_COUNT', 'default': 5, 'description': _(u'Maximum number of search queries to remember per user.')},
{'name': 'SHOW_OBJECT_TYPE', 'global_name': 'SEARCH_SHOW_OBJECT_TYPE', 'default': True, 'hidden': True},
{'name': 'LIMIT', 'global_name': 'SEARCH_LIMIT', 'default': 100, 'description': _('Maximum amount search hits to fetch and display.')},
{'name': 'RECENT_COUNT', 'global_name': 'SEARCH_RECENT_COUNT', 'default': 5, 'description': _('Maximum number of search queries to remember per user.')},
]
)
mayan/apps/dynamic_search/templatetags/search_tags.py
+6 -4
View File
@@ -1,3 +1,5 @@
from __future__ import unicode_literals
from django.core.urlresolvers import reverse
from django.template import Library
from django.utils.translation import ugettext as _
@@ -16,8 +18,8 @@ def search_form(context):
'request': context['request'],
'STATIC_URL': context['STATIC_URL'],
'form_action': reverse('search'),
'form_title': _(u'Search'),
'submit_label': _(u'Search'),
'form_title': _('Search'),
'submit_label': _('Search'),
'submit_icon_famfam': 'zoom',
})
return context
@@ -34,9 +36,9 @@ def recent_searches_template(context):
'request': context['request'],
'STATIC_URL': context['STATIC_URL'],
'side_bar': True,
'title': _(u'Recent searches (maximum of %d)') % RECENT_COUNT,
'title': _('Recent searches (maximum of %d)') % RECENT_COUNT,
'paragraphs': [
u'<a href="%(url)s"><span class="famfam active famfam-%(icon)s"></span>%(text)s</a>' % {
'<a href="%(url)s"><span class="famfam active famfam-%(icon)s"></span>%(text)s</a>' % {
'text': rs,
'url': rs.url(),
'icon': 'zoom_in' if rs.is_advanced() else 'zoom',
mayan/apps/dynamic_search/tests.py
+1 -1
View File
@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import unicode_literals
import os
mayan/apps/dynamic_search/urls.py
+2
View File
@@ -1,3 +1,5 @@
from __future__ import unicode_literals
from django.conf.urls import patterns, url
from .api_views import (APIRecentSearchListView, APIRecentSearchView,
mayan/apps/dynamic_search/views.py
+7 -7
View File
@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import unicode_literals
import logging
import urlparse
@@ -35,7 +35,7 @@ def results(request, extra_context=None):
context.update({
'object_list': queryset,
'time_delta': timedelta,
'title': _(u'Results'),
'title': _('Results'),
})
if extra_context:
@@ -43,7 +43,7 @@ def results(request, extra_context=None):
if SHOW_OBJECT_TYPE:
context.update({
'extra_columns': [{'name': _(u'Type'), 'attribute': lambda x: x._meta.verbose_name[0].upper() + x._meta.verbose_name[1:]}]
'extra_columns': [{'name': _('Type'), 'attribute': lambda x: x._meta.verbose_name[0].upper() + x._meta.verbose_name[1:]}]
})
return render_to_response('search_results.html', context,
@@ -59,19 +59,19 @@ def search(request, advanced=False):
'main/generic_form.html',
{
'form': form,
'title': _(u'Advanced search'),
'title': _('Advanced search'),
'form_action': reverse('search:results'),
'submit_method': 'GET',
'search_results_limit': LIMIT,
'submit_label': _(u'Search'),
'submit_label': _('Search'),
'submit_icon_famfam': 'zoom',
}, context_instance=RequestContext(request)
)
else:
extra_context = {
'submit_label': _(u'Search'),
'submit_label': _('Search'),
'submit_icon_famfam': 'zoom',
'form_title': _(u'Search'),
'form_title': _('Search'),
'form_hide_required_text': True,
}
if ('q' in request.GET) and request.GET['q'].strip():