diff --git a/mayan/apps/dynamic_search/mixins.py b/mayan/apps/dynamic_search/mixins.py index 225adf104c..b755018006 100644 --- a/mayan/apps/dynamic_search/mixins.py +++ b/mayan/apps/dynamic_search/mixins.py @@ -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: diff --git a/mayan/apps/dynamic_search/urls.py b/mayan/apps/dynamic_search/urls.py index 3d4c75ffd1..bfeaaa14a3 100644 --- a/mayan/apps/dynamic_search/urls.py +++ b/mayan/apps/dynamic_search/urls.py @@ -11,17 +11,25 @@ from .views import ( urlpatterns = [ url( - regex=r'^(?P[\.\w]+)/$', view=SearchView.as_view(), + regex=r'^search/(?P[\.\w]+)/$', view=SearchView.as_view(), name='search' ), url( regex=r'^advanced/(?P[\.\w]+)/$', view=AdvancedSearchView.as_view(), name='search_advanced' ), + url( + regex=r'^advanced/$', + view=AdvancedSearchView.as_view(), name='search_advanced' + ), url( regex=r'^again/(?P[\.\w]+)/$', view=SearchAgainView.as_view(), name='search_again' ), + url( + regex=r'^results/$', + view=ResultsView.as_view(), name='results' + ), url( regex=r'^results/(?P[\.\w]+)/$', view=ResultsView.as_view(), name='results'