diff options
author | Elliot Smith <elliot.smith@intel.com> | 2015-10-14 13:29:11 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-16 14:16:17 +0100 |
commit | b5624c77ed91d20f1ab4737a921baa908cf00646 (patch) | |
tree | f4d77082c13b46d2c1e07d2f299113dd7064848f /bitbake/lib/toaster/toastergui/templates | |
parent | 3c4c984e3356b1bb23d70e25fcd916d91d5a6284 (diff) | |
download | poky-b5624c77ed91d20f1ab4737a921baa908cf00646.tar.gz |
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 <elliot.smith@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/projects.html | 16 |
1 files changed, 13 insertions, 3 deletions
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 @@ | |||
36 | {% else %} {# We have builds to display #} | 36 | {% else %} {# We have builds to display #} |
37 | {% include "basetable_top.html" %} | 37 | {% include "basetable_top.html" %} |
38 | {% for o in objects %} | 38 | {% for o in objects %} |
39 | <tr class="data"> | 39 | <tr class="data" data-project="{{ o.id }}"> |
40 | <td><a href="{% url 'project' o.id %}">{{o.name}}</a></td> | 40 | <td><a href="{% url 'project' o.id %}">{{o.name}}</a></td> |
41 | <td class="updated"><a href="{% url 'project' o.id %}">{{o.updated|date:"d/m/y H:i"}}</a></td> | 41 | <td class="updated"><a href="{% url 'project' o.id %}">{{o.updated|date:"d/m/y H:i"}}</a></td> |
42 | <td> | 42 | <td data-project-field="release"> |
43 | {% if o.release %} | 43 | {% if o.release %} |
44 | <a href="{% url 'project' o.id %}#project-details">{{o.release.name}}</a> | 44 | <a href="{% url 'project' o.id %}#project-details">{{o.release.name}}</a> |
45 | {% elif o.is_default %} | ||
46 | <span class="muted">Not applicable</span> | ||
47 | <i class="icon-question-sign get-help hover-help" title="" data-original-title="This project does not have a release set. It simply collects information about the builds you start from the command line while Toaster is running" style="visibility: hidden;"></i> | ||
45 | {% else %} | 48 | {% else %} |
46 | No release available | 49 | No release available |
47 | {% endif %} | 50 | {% endif %} |
48 | </td> | 51 | </td> |
49 | <td><a href="{% url 'project' o.id %}#machine-distro">{{o.get_current_machine_name}}</a></td> | 52 | <td data-project-field="machine"> |
53 | {% if o.is_default %} | ||
54 | <span class="muted">Not applicable</span> | ||
55 | <i class="icon-question-sign get-help hover-help" title="" data-original-title="This project does not have a machine set. It simply collects information about the builds you start from the command line while Toaster is running" style="visibility: hidden;"></i> | ||
56 | {% else %} | ||
57 | <a href="{% url 'project' o.id %}#machine-distro">{{o.get_current_machine_name}}</a> | ||
58 | {% endif %} | ||
59 | </td> | ||
50 | {% if o.get_number_of_builds == 0 %} | 60 | {% if o.get_number_of_builds == 0 %} |
51 | <td class="muted">{{o.get_number_of_builds}}</td> | 61 | <td class="muted">{{o.get_number_of_builds}}</td> |
52 | <td class="loutcome"></td> | 62 | <td class="loutcome"></td> |