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

Fix search app settings variables' casing

Browse Source
This commit is contained in:
Roberto Rosario
2015-06-24 13:07:36 -04:00
parent ce329b1ca2
commit 00427da11e
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mayan/apps/dynamic_search/classes.py
View File

@@ -12,7 +12,7 @@ from django.utils.module_loading import import_string
from acls.models import AccessEntry
from permissions.models import Permission
from .settings import LIMIT
from .settings import setting_limit
logger = logging.getLogger(__name__)
@@ -163,7 +163,7 @@ class SearchModel(object):
elapsed_time = unicode(datetime.datetime.now() - start_time).split(':')[2]
queryset = self.model.objects.in_bulk(list(result_set)[: LIMIT.value]).values()
queryset = self.model.objects.in_bulk(list(result_set)[: setting_limit.value]).values()
if self.permission:
try:

4
mayan/apps/dynamic_search/managers.py
View File

@@ -4,7 +4,7 @@ from django.contrib.auth.models import AnonymousUser
from django.db import models
from django.utils.http import urlencode
from .settings import RECENT_COUNT
from .settings import setting_recent_count
class RecentSearchManager(models.Manager):
@@ -31,5 +31,5 @@ class RecentSearchManager(models.Manager):
new_recent.hits = hits
new_recent.save()
for recent_to_delete in self.model.objects.filter(user=user)[RECENT_COUNT.value:]:
for recent_to_delete in self.model.objects.filter(user=user)[setting_recent_count.value:]:
recent_to_delete.delete()

6
mayan/apps/dynamic_search/settings.py
View File

@@ -6,6 +6,6 @@ from smart_settings import Namespace
namespace = Namespace(name='dynamic_search', label=_('Search'))
SHOW_OBJECT_TYPE = namespace.add_setting(global_name='SEARCH_SHOW_OBJECT_TYPE', default=True)
LIMIT = namespace.add_setting(global_name='SEARCH_LIMIT', default=100, help_text=_('Maximum amount search hits to fetch and display.'))
RECENT_COUNT = namespace.add_setting(global_name='SEARCH_RECENT_COUNT', default=5, help_text=_('Maximum number of search queries to remember per user.'))
setting_show_object_type = namespace.add_setting(global_name='SEARCH_SHOW_OBJECT_TYPE', default=True)
setting_limit = namespace.add_setting(global_name='SEARCH_LIMIT', default=100, help_text=_('Maximum amount search hits to fetch and display.'))
setting_recent_count = namespace.add_setting(global_name='SEARCH_RECENT_COUNT', default=5, help_text=_('Maximum number of search queries to remember per user.'))

8
mayan/apps/dynamic_search/views.py
View File

@@ -12,7 +12,7 @@ from django.utils.translation import ugettext_lazy as _
from .classes import SearchModel
from .forms import SearchForm, AdvancedSearchForm
from .settings import LIMIT, SHOW_OBJECT_TYPE
from .settings import setting_limit, setting_show_object_type
logger = logging.getLogger(__name__)
@@ -23,7 +23,7 @@ def results(request, extra_context=None):
context = {
'query_string': request.GET,
'hide_links': True,
'search_results_limit': LIMIT.value,
'search_results_limit': setting_limit.value,
}
if request.GET:
@@ -42,7 +42,7 @@ def results(request, extra_context=None):
if extra_context:
context.update(extra_context)
if SHOW_OBJECT_TYPE.value:
if setting_show_object_type.value:
context.update({
'extra_columns': [{'name': _('Type'), 'attribute': lambda x: x._meta.verbose_name[0].upper() + x._meta.verbose_name[1:]}]
})
@@ -63,7 +63,7 @@ def search(request, advanced=False):
'title': _('Advanced search'),
'form_action': reverse('search:results'),
'submit_method': 'GET',
'search_results_limit': LIMIT.value,
'search_results_limit': setting_limit.value,
'submit_label': _('Search'),
'submit_icon': 'fa fa-search',
}, context_instance=RequestContext(request)