diff options
-rw-r--r-- | bitbake/lib/toaster/toastergui/views.py | 5 |
1 files changed, 4 insertions, 1 deletions
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): | |||
1010 | template = 'configvars.html' | 1010 | template = 'configvars.html' |
1011 | mandatory_parameters = { 'count': 100, 'page' : 1, 'orderby':'variable_name:+', 'filter':'description__regex:.+'}; | 1011 | mandatory_parameters = { 'count': 100, 'page' : 1, 'orderby':'variable_name:+', 'filter':'description__regex:.+'}; |
1012 | retval = _verify_parameters( request.GET, mandatory_parameters ) | 1012 | retval = _verify_parameters( request.GET, mandatory_parameters ) |
1013 | (filter_string, search_term, ordering_string) = _search_tuple(request, Variable) | ||
1013 | if retval: | 1014 | if retval: |
1015 | # if new search, clear the default filter | ||
1016 | if search_term and len(search_term): | ||
1017 | mandatory_parameters['filter']='' | ||
1014 | return _redirect_parameters( 'configvars', request.GET, mandatory_parameters, build_id = build_id) | 1018 | return _redirect_parameters( 'configvars', request.GET, mandatory_parameters, build_id = build_id) |
1015 | 1019 | ||
1016 | (filter_string, search_term, ordering_string) = _search_tuple(request, Variable) | ||
1017 | queryset = Variable.objects.filter(build=build_id).exclude(variable_name__istartswith='B_').exclude(variable_name__istartswith='do_') | 1020 | queryset = Variable.objects.filter(build=build_id).exclude(variable_name__istartswith='B_').exclude(variable_name__istartswith='do_') |
1018 | queryset_with_search = _get_queryset(Variable, queryset, None, search_term, ordering_string).distinct().exclude(variable_value='',vhistory__file_name__isnull=True) | 1021 | queryset_with_search = _get_queryset(Variable, queryset, None, search_term, ordering_string).distinct().exclude(variable_value='',vhistory__file_name__isnull=True) |
1019 | queryset = _get_queryset(Variable, queryset, filter_string, search_term, ordering_string) | 1022 | queryset = _get_queryset(Variable, queryset, filter_string, search_term, ordering_string) |