summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@intel.com>2015-03-19 12:29:55 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-24 22:54:36 +0000
commit994b19ef7f633b8d463efa7022f2e17cd483a387 (patch)
tree4c27ff7f42cb41c06e6cc740f559a83d41fdd600
parentcbf3d652dcbfc1db527eb13cd796fa57d8ff3748 (diff)
downloadbitbake-994b19ef7f633b8d463efa7022f2e17cd483a387.tar.gz
toastergui: changes to the all projects table
The 'Last build' column in the all projects table was supposed to provide the completion time stamp of the latest project build. Instead, it is showing the time stamp of the latest project activity, which includes: * when the project was created and * when the last build started but not when you make a change to the configuration. The result is that the column and the sorting are very misleading. The template is set so that the time stamp only shows when the project has builds (if 0 builds, no time stamp is shown). But of course the sorting still happens according to the value, even if it doesn't display. The result is that, when you sort by the 'Last build' column, projects with no builds appear listed between projects with builds, and you have no idea why. This patch: * changes the column label * its position in the table * makes sure the time stamp always displays * and adds help text to reflect what the data actually means. It also makes some small changes to other table headings. Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
-rw-r--r--lib/toaster/toastergui/templates/projects.html3
-rwxr-xr-xlib/toaster/toastergui/views.py22
2 files changed, 13 insertions, 12 deletions
diff --git a/lib/toaster/toastergui/templates/projects.html b/lib/toaster/toastergui/templates/projects.html
index 88ee4bcd6..23340083c 100644
--- a/lib/toaster/toastergui/templates/projects.html
+++ b/lib/toaster/toastergui/templates/projects.html
@@ -38,11 +38,11 @@
{% for o in objects %}
<tr class="data">
<td><a href="{% url 'project' o.id %}">{{o.name}}</a></td>
+ <td class="updated"><a href="{% url 'project' o.id %}">{{o.updated|date:"d/m/y H:i"}}</a></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>
@@ -50,7 +50,6 @@
<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>
diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py
index 9f3506292..4ebcf6d54 100755
--- a/lib/toaster/toastergui/views.py
+++ b/lib/toaster/toastergui/views.py
@@ -3207,6 +3207,13 @@ if toastermain.settings.MANAGED:
'ordericon':_get_toggle_order_icon(request, "name"),
'orderkey' : 'name',
},
+ {'name': 'Last activity on',
+ 'clclass': 'updated',
+ 'qhelp': "Shows the starting date and time of the last project build. If the project has no builds, it shows the date the project was created",
+ 'orderfield': _get_toggle_order(request, "updated", True),
+ 'ordericon':_get_toggle_order_icon(request, "updated"),
+ 'orderkey' : 'updated',
+ },
{'name': 'Release',
'qhelp' : "The version of the build system used by the project",
'orderfield': _get_toggle_order(request, "release__name"),
@@ -3219,24 +3226,19 @@ if toastermain.settings.MANAGED:
{'name': 'Number of builds',
'qhelp': "How many builds have been run for the project",
},
- {'name': 'Last build', 'clclass': 'updated',
- 'orderfield': _get_toggle_order(request, "updated", True),
- 'ordericon':_get_toggle_order_icon(request, "updated"),
- 'orderkey' : 'updated',
- },
- {'name': 'Last outcome', 'clclass': 'loutcome',
+ {'name': 'Last build outcome', 'clclass': 'loutcome',
'qhelp': "Tells you if the last project build completed successfully or failed",
},
- {'name': 'Last target', 'clclass': 'ltarget',
+ {'name': 'Target', 'clclass': 'ltarget',
'qhelp': "The last project build target(s): one or more recipes or image recipes",
},
- {'name': 'Last errors', 'clclass': 'lerrors',
+ {'name': 'Errors', 'clclass': 'lerrors',
'qhelp': "How many errors were encountered during the last project build (if any)",
},
- {'name': 'Last warnings', 'clclass': 'lwarnings',
+ {'name': 'Warnings', 'clclass': 'lwarnings',
'qhelp': "How many warnigns were encountered during the last project build (if any)",
},
- {'name': 'Last image files', 'clclass': 'limagefiles', 'hidden': 1,
+ {'name': 'Image files', 'clclass': 'limagefiles', 'hidden': 1,
'qhelp': "The root file system types produced by the last project build",
},
]