Patchwork [bitbake-devel,09/18] toaster: Change "0 found" to "No found"

login
register
mail settings
Submitter Alexandru DAMIAN
Date March 24, 2014, 6:37 p.m.
Message ID <8d71bd39947dd909d02c8d33847e5852c9f20f19.1395686148.git.alexandru.damian@intel.com>
Download mbox | patch
Permalink /patch/69103/
State New
Headers show

Comments

Alexandru DAMIAN - March 24, 2014, 6:37 p.m.
From: Belen Barros Pena <belen.barros.pena@intel.com>

Change the string in the h1 when search returns no results
from "0 things found" to "None things found". The change
applies to the BitBake variables, tasks, recipes, packages
built, time, CPU and disk I/O tables.

[YOCTO #5981]

Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
---
 lib/toaster/toastergui/templates/bpackage.html   | 6 +++---
 lib/toaster/toastergui/templates/configvars.html | 6 +++---
 lib/toaster/toastergui/templates/recipes.html    | 6 +++---
 lib/toaster/toastergui/templates/tasks.html      | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

Patch

diff --git a/lib/toaster/toastergui/templates/bpackage.html b/lib/toaster/toastergui/templates/bpackage.html
index 7da8ce7..dad0d7f 100644
--- a/lib/toaster/toastergui/templates/bpackage.html
+++ b/lib/toaster/toastergui/templates/bpackage.html
@@ -10,10 +10,10 @@ 
 <div class="span10">
 <div class="page-header">
 <h1>
-  {% if request.GET.filter or request.GET.search and objects.count > 0  %}
+  {% if request.GET.search and objects.paginator.count > 0  %}
       {{objects.paginator.count}} package{{objects.paginator.count|pluralize}} found
-  {%elif objects.paginator.count == 0%}
-      No Packages
+  {%elif request.GET.search and objects.paginator.count == 0%}
+      No packages found
   {%else%}
       Packages
   {%endif%}
diff --git a/lib/toaster/toastergui/templates/configvars.html b/lib/toaster/toastergui/templates/configvars.html
index d705253..24cb2a5 100644
--- a/lib/toaster/toastergui/templates/configvars.html
+++ b/lib/toaster/toastergui/templates/configvars.html
@@ -10,10 +10,10 @@ 
 <div class="row-fluid span10">
  <div class="page-header">
  <h1>
-  {% if request.GET.filter or request.GET.search and objects.count > 0  %}
+  {% if request.GET.filter and objects.paginator.count > 0 or request.GET.search and objects.paginator.count > 0 %}
       {{objects.paginator.count}} variable{{objects.paginator.count|pluralize}} found
-  {%elif objects.paginator.count == 0%}
-      No variables
+  {%elif request.GET.filter and objects.paginator.count == 0 or request.GETs.search and objects.paginator.count == 0 %}
+      No variables found
   {%else%}
       Configuration
   {%endif%}
diff --git a/lib/toaster/toastergui/templates/recipes.html b/lib/toaster/toastergui/templates/recipes.html
index 860d30d..22c3d1a 100755
--- a/lib/toaster/toastergui/templates/recipes.html
+++ b/lib/toaster/toastergui/templates/recipes.html
@@ -10,10 +10,10 @@ 
 <div class="span10">
 <div class="page-header">
 <h1>
-  {% if request.GET.filter or request.GET.search and objects.count > 0  %}
+  {% if request.GET.search and objects.paginator.count > 0  %}
       {{objects.paginator.count}} recipe{{objects.paginator.count|pluralize}} found
-  {%elif objects.paginator.count == 0%}
-      No Recipes
+  {%elif request.GET.search and objects.paginator.count == 0%}
+      No recipes found
   {%else%}
       Recipes
   {%endif%}
diff --git a/lib/toaster/toastergui/templates/tasks.html b/lib/toaster/toastergui/templates/tasks.html
index d881811..a2629dc 100644
--- a/lib/toaster/toastergui/templates/tasks.html
+++ b/lib/toaster/toastergui/templates/tasks.html
@@ -8,10 +8,10 @@ 
 <div class="span10">
 <div class="page-header">
 <h1>
-  {% if request.GET.filter or request.GET.search and objects.count > 0  %}
+  {% if request.GET.filter or request.GET.search and objects.paginator.count > 0  %}
       {{objects.paginator.count}} task{{objects.paginator.count|pluralize}} found
-  {%elif objects.paginator.count == 0%}
-      No tasks
+  {%elif request.GET.filter or request.GET.search and objects.paginator.count == 0%}
+      No tasks found
   {%else%}
       {{title}}
   {%endif%}