From b5624c77ed91d20f1ab4737a921baa908cf00646 Mon Sep 17 00:00:00 2001 From: Elliot Smith Date: Wed, 14 Oct 2015 13:29:11 -0700 Subject: bitbake: toaster: Show 'not applicable' for default project machine and release The machine and release for the default project should show as 'not applicable' on the all projects page, as that information isn't available for command-line builds. Modify the templates with some conditionals to check for the default project row, plus some data-* attributes to mark where that data is to make testing possible. Add some tests for the all projects page to ensure that the correct machine/release are still shown for non-default projects, and 'not applicable' for the default project. [YOCTO #8231] (Bitbake rev: ce27b3fd728f0373aa1adc0d47baace264529b45) Signed-off-by: Elliot Smith Signed-off-by: Ed Bartosh Signed-off-by: brian avery Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/templates/projects.html | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/toaster/toastergui/templates/projects.html') diff --git a/bitbake/lib/toaster/toastergui/templates/projects.html b/bitbake/lib/toaster/toastergui/templates/projects.html index c2d77b5a37..a7192c2d72 100644 --- a/bitbake/lib/toaster/toastergui/templates/projects.html +++ b/bitbake/lib/toaster/toastergui/templates/projects.html @@ -36,17 +36,27 @@ {% else %} {# We have builds to display #} {% include "basetable_top.html" %} {% for o in objects %} - + {{o.name}} {{o.updated|date:"d/m/y H:i"}} - + {% if o.release %} {{o.release.name}} + {% elif o.is_default %} + Not applicable + {% else %} No release available {% endif %} - {{o.get_current_machine_name}} + + {% if o.is_default %} + Not applicable + + {% else %} + {{o.get_current_machine_name}} + {% endif %} + {% if o.get_number_of_builds == 0 %} {{o.get_number_of_builds}} -- cgit v1.2.3-54-g00ecf