bitbake: toaster: all projects data and sorts

Implement the 'last build' data methods, enhance variable display,
add empty page and empty sort support.

[YOCTO #6682]

(Bitbake rev: cc6ca17e80844ecb4a777276d5f5177ebbcd93f9)

Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 60 insertions, 22 deletions

diff --git a/bitbake/lib/toaster/toastergui/templates/managed_builds.html b/bitbake/lib/toaster/toastergui/templates/managed_builds.html
index a4db55b967..e23b832bae 100644
--- a/bitbake/lib/toaster/toastergui/templates/managed_builds.html
+++ b/bitbake/lib/toaster/toastergui/templates/managed_builds.html
@@ -56,6 +56,13 @@
             </td>
             <td class="target">{% for t in build.target_set.all %} <a href="{% url "builddashboard" build.id %}"> {{t.target}} </a> <br />{% endfor %}</td>
             <td class="machine"><a href="{% url "builddashboard" build.id %}">{{build.machine}}</a></td>
+   {% if MANAGED %}
+            <td class="project">
+            {% if build.project %}
+                <a href="{% url 'project' build.project.id %}">{{build.project.name}}</a>
+            {% endif %}
+            </td>
+   {% endif %}
             <td class="started_on"><a href="{% url "builddashboard" build.id %}">{{build.started_on|date:"d/m/y H:i"}}</a></td>
             <td class="completed_on"><a href="{% url "builddashboard" build.id %}">{{build.completed_on|date:"d/m/y H:i"}}</a></td>
             <td class="failed_tasks error">
@@ -91,13 +98,6 @@
               <a href="{%url "builddashboard" build.id%}#images">{{fstypes|get_dict_value:build.id}}</a>
               {% endif %}
             </td>
-   {% if MANAGED %}
-            <td class="project">
-            {% if build.project %}
-                <a href="{% url 'project' build.project.id %}">{{build.project.name}}</a>
-            {% endif %}
-            </td>
-   {% endif %}
         </tr>
 
 
@@ -114,6 +114,11 @@
             <td class="machine">
                 <a href="{% url "buildrequestdetails" buildrequest.project.id buildrequest.id %}">{{buildrequest.machine}}</a>
             </td>
+   {% if MANAGED %}
+            <td class="project">
+                <a href="{% url 'project' buildrequest.project.id %}">{{buildrequest.project.name}}</a>
+            </td>
+   {% endif %}
             <td class="started_on">
                 <a href="{% url "buildrequestdetails" buildrequest.project.id buildrequest.id %}">{{buildrequest.created|date:"d/m/y H:i"}}</a>
             </td>
@@ -132,9 +137,6 @@
             </td>
             <td class="output"> {# we have no output here #}
             </td>
-            <td class="project">
-                <a href="{% url 'project' buildrequest.project.id %}">{{buildrequest.project.name}}</a>
-            </td>
         </tr>
           {%endif%}
         {% endfor %}
diff --git a/bitbake/lib/toaster/toastergui/templates/projects.html b/bitbake/lib/toaster/toastergui/templates/projects.html
index 0396e25a3a..88d5bd32df 100644
--- a/bitbake/lib/toaster/toastergui/templates/projects.html
+++ b/bitbake/lib/toaster/toastergui/templates/projects.html
@@ -12,25 +12,61 @@
 
   <div class="page-header top-air">
       <h1>
-         All projects
+      {% if request.GET.filter and objects.paginator.count > 0 or request.GET.search and objects.paginator.count > 0 %}
+          {{objects.paginator.count}} project{{objects.paginator.count|pluralize}} found
+      {%elif request.GET.filter and objects.paginator.count == 0 or request.GET.search and objects.paginator.count == 0 %}
+          No projects found
+      {%else%}
+          All projects
+      {%endif%}
        </h1>
   </div>
 
-{% include "basetable_top_projectbuilds.html" %}
+  {% if objects.paginator.count == 0 %}
+    <div class="row-fluid">
+      <div class="alert">
+        <form class="no-results input-append" id="searchform">
+            <input id="search" name="search" class="input-xxlarge" type="text" value="{{request.GET.search}}"/>{% if request.GET.search %}<a href="javascript:$('#search').val('');searchform.submit()" class="add-on btn" tabindex="-1"><i class="icon-remove"></i></a>{% endif %}
+            <button class="btn" type="submit" value="Search">Search</button>
+            <button class="btn btn-link" onclick="javascript:$('#search').val('');searchform.submit()">Show all projects</button>
+        </form>
+      </div>
+    </div>
+
+  {% else %} {# We have builds to display #}
+  {% include "basetable_top_projectbuilds.html" %}
   {% for o in objects %}
     <tr class="data">
       <td><a href="{% url 'project' o.id %}">{{o.name}}</a></td>
-      <td><a href="{% url 'project' o.id %}">{{o.release.name}}</a></td>
-      <td>{{o.get_current_machine_name}}</td>
-      <td>{{o.get_number_of_builds}}</td>
-      <td class="loutcome">{{o.get_last_outcome}}</td>
-      <td class="ltarget">{{o.get_last_target}}</td>
-      <td class="lerrors">{{o.get_last_errors}}</td>
-      <td class="lwarnings">{{o.get_last_warnings}}</td>
-      <td class="limagefiles">{{o.get_last_imgfiles}}</td>
-      <td class="updated">{{o.updated|date:"d/m/y H:i"}}</td>
+      <td><a href="{% url 'project' o.id %}#project-details">{{o.release.name}}</a></td>
+      <td><a href="{% url 'project' o.id %}#machine-distro">{{o.get_current_machine_name}}</a></td>
+      {% if o.get_number_of_builds == 0 %}
+      <td class="muted">{{o.get_number_of_builds}}</td>
+      <td class="updated"></td>
+      <td class="loutcome"></td>
+      <td class="ltarget"></td>
+      <td class="lerrors"></td>
+      <td class="lwarnings"></td>
+      <td class="limagefiles"></td>
+      {% else %}
+      <td><a href="{% url 'projectbuilds' o.id %}">{{o.get_number_of_builds}}</a></td>
+      <td class="updated"><a href="{% url "builddashboard" o.get_last_build_id %}">{{o.updated|date:"d/m/y H:i"}}</a></td>
+      <td class="loutcome"><a href="{% url "builddashboard" o.get_last_build_id %}">{%if o.get_last_outcome == build_SUCCEEDED%}<i class="icon-ok-sign success"></i>{%elif o.get_last_outcome == build_FAILED%}<i class="icon-minus-sign error"></i>{%else%}{%endif%}</a></td>
+      <td class="ltarget"><a href="{% url "builddashboard" o.get_last_build_id %}">{{o.get_last_target}} </a></td>
+          <td class="lerrors">{% if o.get_last_errors %}<a class="errors_no error" href="{% url "builddashboard" o.get_last_build_id %}#errors">{{o.get_last_errors}} error{{o.get_last_errors|pluralize}}</a>{%endif%}</td>
+          <td class="lwarnings">{% if o.get_last_warnings %}<a class="warnings_no warning" href="{% url "builddashboard" o.get_last_build_id %}#warnings">{{o.get_last_warnings}} warning{{o.get_last_warnings|pluralize}}</a>{%endif%}</td>
+      <td class="limagefiles">
+            {% if o.get_last_outcome == build_SUCCEEDED %}
+            <a href="{%url "builddashboard" o.get_last_build_id %}#images">{{fstypes|get_dict_value:o.id}}</a>
+            {% endif %}
+          </td>
+
+      {% endif %}
     </tr>
   {% endfor %}
-{% include "basetable_bottom.html" %}
+  {% include "basetable_bottom.html" %}
+  {% endif %} {# empty #}
 
 {% endblock %}
+
+