diff options
-rw-r--r-- | bitbake/lib/toaster/toastergui/views.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 96ce4d7fcf..4ed99400c8 100644 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -80,7 +80,7 @@ def _redirect_parameters(view, g, mandatory_parameters, *args, **kwargs): | |||
80 | return redirect(url + "?%s" % urllib.urlencode(params), *args, **kwargs) | 80 | return redirect(url + "?%s" % urllib.urlencode(params), *args, **kwargs) |
81 | 81 | ||
82 | FIELD_SEPARATOR = ":" | 82 | FIELD_SEPARATOR = ":" |
83 | VALUE_SEPARATOR = ";" | 83 | VALUE_SEPARATOR = "!" |
84 | DESCENDING = "-" | 84 | DESCENDING = "-" |
85 | 85 | ||
86 | def __get_q_for_val(name, value): | 86 | def __get_q_for_val(name, value): |
@@ -102,7 +102,7 @@ def _get_filtering_query(filter_string): | |||
102 | values = search_terms[1].split(VALUE_SEPARATOR) | 102 | values = search_terms[1].split(VALUE_SEPARATOR) |
103 | 103 | ||
104 | querydict = dict(zip(keys, values)) | 104 | querydict = dict(zip(keys, values)) |
105 | return reduce(lambda x, y: x & y, map(lambda x: __get_q_for_val(k, querydict[k]),[k for k in querydict])) | 105 | return reduce(operator.and_, map(lambda x: __get_q_for_val(x, querydict[x]), [k for k in querydict])) |
106 | 106 | ||
107 | def _get_toggle_order(request, orderkey, reverse = False): | 107 | def _get_toggle_order(request, orderkey, reverse = False): |
108 | if reverse: | 108 | if reverse: |
@@ -128,7 +128,7 @@ def _validate_input(input, model): | |||
128 | 128 | ||
129 | # Check we have only one colon | 129 | # Check we have only one colon |
130 | if len(input_list) != 2: | 130 | if len(input_list) != 2: |
131 | invalid = "We have an invalid number of separators" | 131 | invalid = "We have an invalid number of separators: " + input + " -> " + str(input_list) |
132 | return None, invalid | 132 | return None, invalid |
133 | 133 | ||
134 | # Check we have an equal number of terms both sides of the colon | 134 | # Check we have an equal number of terms both sides of the colon |