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

Search: Refactor classes

Browse Source 
Add additional classes to split existing classes that are too complex.

Remove search timming.

Add query explainer.

Move literals to their own module.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-12-04 00:04:41 -04:00
parent 1d1b4f5f5f
commit 396f9f6fca
3 changed files with 242 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mayan/apps/dynamic_search/views.py
+20 -3
View File
@@ -18,21 +18,38 @@ logger = logging.getLogger(__name__)
class ResultsView(SearchModelMixin, SingleObjectListView):
def get_extra_context(self):
search_query = self.get_search_query()
context = {
'hide_links': True,
'list_as_items': True,
'no_results_icon': icon_search_submit,
'no_results_text': _(
'Try again using different terms. '
'Try again using different terms.'
),
'no_results_title': _('No search results'),
'search_model': self.search_model,
'search_results_limit': setting_limit.value,
'title': _('Search results for: %s') % self.search_model.label,
'subtitle': search_query,
'title': _('Search results for: %s') % self.get_search_model(),
}
return context
def get_search_query(self):
if self.request.GET:
# Only do search if there is user input, otherwise just render
# the template with the extra_context
if self.request.GET.get('_match_all', 'off') == 'on':
global_and_search = True
else:
global_and_search = False
return self.search_model.get_search_query(
query_string=self.request.GET, global_and_search=global_and_search
)
def get_object_list(self):
self.search_model = self.get_search_model()
@@ -45,7 +62,7 @@ class ResultsView(SearchModelMixin, SingleObjectListView):
else:
global_and_search = False
queryset, timedelta = self.search_model.search(
queryset = self.search_model.search(
query_string=self.request.GET, user=self.request.user,
global_and_search=global_and_search
)