From ef1063610a82c52ab2bdd4466d3c6f2042b75262 Mon Sep 17 00:00:00 2001 From: David Reyna Date: Sat, 15 Mar 2014 15:10:27 -0700 Subject: bitbake: toaster: reset default filter for configvar page on new searches The configvar page has a default filter by design. However, new search terms should override and clear that filter, for consistency across the interface. [YOCTO #5961] (Bitbake rev: b80c578d9330a45e9c2502701de2ebb6307b1caf) Signed-off-by: David Reyna Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 97514cc0f6..eaa6cf8c5f 100644 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -1010,10 +1010,13 @@ def configvars(request, build_id): template = 'configvars.html' mandatory_parameters = { 'count': 100, 'page' : 1, 'orderby':'variable_name:+', 'filter':'description__regex:.+'}; retval = _verify_parameters( request.GET, mandatory_parameters ) + (filter_string, search_term, ordering_string) = _search_tuple(request, Variable) if retval: + # if new search, clear the default filter + if search_term and len(search_term): + mandatory_parameters['filter']='' return _redirect_parameters( 'configvars', request.GET, mandatory_parameters, build_id = build_id) - (filter_string, search_term, ordering_string) = _search_tuple(request, Variable) queryset = Variable.objects.filter(build=build_id).exclude(variable_name__istartswith='B_').exclude(variable_name__istartswith='do_') queryset_with_search = _get_queryset(Variable, queryset, None, search_term, ordering_string).distinct().exclude(variable_value='',vhistory__file_name__isnull=True) queryset = _get_queryset(Variable, queryset, filter_string, search_term, ordering_string) -- cgit v1.2.3-54-g00ecf