diff options
| author |   David Reyna <David.Reyna@windriver.com> | 2014-03-15 15:10:27 -0700 |
|---|---|---|
| committer |   Alexandru DAMIAN <alexandru.damian@intel.com> | 2014-03-24 18:32:18 +0000 |
| commit | b80c578d9330a45e9c2502701de2ebb6307b1caf (patch) | |
| tree | 49a1102ab2f5fe7d3f5c7d8ff3e16c31fca5cc06 /lib | |
| parent | 6be58123fcdb0ff20de2a88315e1e3012effd1d3 (diff) | |
| download | bitbake-b80c578d9330a45e9c2502701de2ebb6307b1caf.tar.gz | |
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]
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/toaster/toastergui/views.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py index 97514cc0f..eaa6cf8c5 100644 --- a/lib/toaster/toastergui/views.py +++ b/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) |