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

Allow passing search model via querystring

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2019-06-10 02:27:30 -04:00
parent 0d6462831a
commit f160de4381
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,11 @@ from .classes import SearchModel
class SearchModelMixin(object):
def get_search_model_name(self):
return self.kwargs.get('search_model')
return self.kwargs.get(
'search_model', self.request.GET.get(
'_search_model', self.request.POST.get('_search_model')
)
)
def get_search_model(self):
try:

10
mayan/apps/dynamic_search/urls.py
View File

@@ -11,17 +11,25 @@ from .views import (
urlpatterns = [
url(
regex=r'^(?P<search_model>[\.\w]+)/$', view=SearchView.as_view(),
regex=r'^search/(?P<search_model>[\.\w]+)/$', view=SearchView.as_view(),
name='search'
),
url(
regex=r'^advanced/(?P<search_model>[\.\w]+)/$',
view=AdvancedSearchView.as_view(), name='search_advanced'
),
url(
regex=r'^advanced/$',
view=AdvancedSearchView.as_view(), name='search_advanced'
),
url(
regex=r'^again/(?P<search_model>[\.\w]+)/$',
view=SearchAgainView.as_view(), name='search_again'
),
url(
regex=r'^results/$',
view=ResultsView.as_view(), name='results'
),
url(
regex=r'^results/(?P<search_model>[\.\w]+)/$',
view=ResultsView.as_view(), name='results'