[PATCH] toaster: fix typo which causes table searches to fail

[PATCH] toaster: fix typo which causes table searches to fail

[Elliot Smith]

The iterator used to create a search query refers to a
variable "x" which isn't set, causing an "'x' is not defined" error
and preventing table searches (on non-ToasterTables) from working.

Use the "field" variable instead, which contains the name of the
field to add to the query.

[YOCTO #9749]

Signed-off-by: Elliot Smith <elliot.smith@intel.com>
---
 bitbake/lib/toaster/toastergui/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 0254876..28ff67b 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -324,7 +324,7 @@ def _get_search_results(search_term, queryset, model):
     for st in search_term.split(" "):
         queries = None
         for field in model.search_allowed_fields:
-            query =  Q(**{x+'__icontains': st})
+            query = Q(**{field + '__icontains': st})
             queries = queries | query if queries else query
 
         search_object = search_object & queries if search_object else queries
-- 
2.7.4

[PATCH] toaster: fix typo which causes table searches to fail

[Michael Wood]

From: Elliot Smith <elliot.smith@intel.com>

The iterator used to create a search query refers to a
variable "x" which isn't set, causing an "'x' is not defined" error
and preventing table searches (on non-ToasterTables) from working.

Use the "field" variable instead, which contains the name of the
field to add to the query.

[YOCTO #9749]

Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
---
 lib/toaster/toastergui/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py
index 0254876..28ff67b 100755
--- a/lib/toaster/toastergui/views.py
+++ b/lib/toaster/toastergui/views.py
@@ -324,7 +324,7 @@ def _get_search_results(search_term, queryset, model):
     for st in search_term.split(" "):
         queries = None
         for field in model.search_allowed_fields:
-            query =  Q(**{x+'__icontains': st})
+            query = Q(**{field + '__icontains': st})
             queries = queries | query if queries else query
 
         search_object = search_object & queries if search_object else queries
-- 
2.7.4

Re: [PATCH] toaster: fix typo which causes table searches to fail

[Michael Wood]

Looks good to me. Send to bitbake-devel and applied to toaster-next.

Thanks,

Michael

On 16/06/16 14:48, Elliot Smith wrote:
> The iterator used to create a search query refers to a
> variable "x" which isn't set, causing an "'x' is not defined" error
> and preventing table searches (on non-ToasterTables) from working.
>
> Use the "field" variable instead, which contains the name of the
> field to add to the query.
>
> [YOCTO #9749]
>
> Signed-off-by: Elliot Smith <elliot.smith@intel.com>
> ---
>   bitbake/lib/toaster/toastergui/views.py | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
> index 0254876..28ff67b 100755
> --- a/bitbake/lib/toaster/toastergui/views.py
> +++ b/bitbake/lib/toaster/toastergui/views.py
> @@ -324,7 +324,7 @@ def _get_search_results(search_term, queryset, model):
>       for st in search_term.split(" "):
>           queries = None
>           for field in model.search_allowed_fields:
> -            query =  Q(**{x+'__icontains': st})
> +            query = Q(**{field + '__icontains': st})
>               queries = queries | query if queries else query
>
>           search_object = search_object & queries if search_object else queries