diff options
Diffstat (limited to 'bitbake/lib/toaster')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/projects.html | 3 | ||||
-rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 22 |
2 files changed, 13 insertions, 12 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/projects.html b/bitbake/lib/toaster/toastergui/templates/projects.html index 88ee4bcd66..23340083ca 100644 --- a/bitbake/lib/toaster/toastergui/templates/projects.html +++ b/bitbake/lib/toaster/toastergui/templates/projects.html | |||
@@ -38,11 +38,11 @@ | |||
38 | {% for o in objects %} | 38 | {% for o in objects %} |
39 | <tr class="data"> | 39 | <tr class="data"> |
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><a href="{% url 'project' o.id %}#project-details">{{o.release.name}}</a></td> | 42 | <td><a href="{% url 'project' o.id %}#project-details">{{o.release.name}}</a></td> |
42 | <td><a href="{% url 'project' o.id %}#machine-distro">{{o.get_current_machine_name}}</a></td> | 43 | <td><a href="{% url 'project' o.id %}#machine-distro">{{o.get_current_machine_name}}</a></td> |
43 | {% if o.get_number_of_builds == 0 %} | 44 | {% if o.get_number_of_builds == 0 %} |
44 | <td class="muted">{{o.get_number_of_builds}}</td> | 45 | <td class="muted">{{o.get_number_of_builds}}</td> |
45 | <td class="updated"></td> | ||
46 | <td class="loutcome"></td> | 46 | <td class="loutcome"></td> |
47 | <td class="ltarget"></td> | 47 | <td class="ltarget"></td> |
48 | <td class="lerrors"></td> | 48 | <td class="lerrors"></td> |
@@ -50,7 +50,6 @@ | |||
50 | <td class="limagefiles"></td> | 50 | <td class="limagefiles"></td> |
51 | {% else %} | 51 | {% else %} |
52 | <td><a href="{% url 'projectbuilds' o.id %}">{{o.get_number_of_builds}}</a></td> | 52 | <td><a href="{% url 'projectbuilds' o.id %}">{{o.get_number_of_builds}}</a></td> |
53 | <td class="updated"><a href="{% url "builddashboard" o.get_last_build_id %}">{{o.updated|date:"d/m/y H:i"}}</a></td> | ||
54 | <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> | 53 | <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> |
55 | <td class="ltarget"><a href="{% url "builddashboard" o.get_last_build_id %}">{{o.get_last_target}} </a></td> | 54 | <td class="ltarget"><a href="{% url "builddashboard" o.get_last_build_id %}">{{o.get_last_target}} </a></td> |
56 | <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> | 55 | <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/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 9f35062925..4ebcf6d54f 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -3207,6 +3207,13 @@ if toastermain.settings.MANAGED: | |||
3207 | 'ordericon':_get_toggle_order_icon(request, "name"), | 3207 | 'ordericon':_get_toggle_order_icon(request, "name"), |
3208 | 'orderkey' : 'name', | 3208 | 'orderkey' : 'name', |
3209 | }, | 3209 | }, |
3210 | {'name': 'Last activity on', | ||
3211 | 'clclass': 'updated', | ||
3212 | '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", | ||
3213 | 'orderfield': _get_toggle_order(request, "updated", True), | ||
3214 | 'ordericon':_get_toggle_order_icon(request, "updated"), | ||
3215 | 'orderkey' : 'updated', | ||
3216 | }, | ||
3210 | {'name': 'Release', | 3217 | {'name': 'Release', |
3211 | 'qhelp' : "The version of the build system used by the project", | 3218 | 'qhelp' : "The version of the build system used by the project", |
3212 | 'orderfield': _get_toggle_order(request, "release__name"), | 3219 | 'orderfield': _get_toggle_order(request, "release__name"), |
@@ -3219,24 +3226,19 @@ if toastermain.settings.MANAGED: | |||
3219 | {'name': 'Number of builds', | 3226 | {'name': 'Number of builds', |
3220 | 'qhelp': "How many builds have been run for the project", | 3227 | 'qhelp': "How many builds have been run for the project", |
3221 | }, | 3228 | }, |
3222 | {'name': 'Last build', 'clclass': 'updated', | 3229 | {'name': 'Last build outcome', 'clclass': 'loutcome', |
3223 | 'orderfield': _get_toggle_order(request, "updated", True), | ||
3224 | 'ordericon':_get_toggle_order_icon(request, "updated"), | ||
3225 | 'orderkey' : 'updated', | ||
3226 | }, | ||
3227 | {'name': 'Last outcome', 'clclass': 'loutcome', | ||
3228 | 'qhelp': "Tells you if the last project build completed successfully or failed", | 3230 | 'qhelp': "Tells you if the last project build completed successfully or failed", |
3229 | }, | 3231 | }, |
3230 | {'name': 'Last target', 'clclass': 'ltarget', | 3232 | {'name': 'Target', 'clclass': 'ltarget', |
3231 | 'qhelp': "The last project build target(s): one or more recipes or image recipes", | 3233 | 'qhelp': "The last project build target(s): one or more recipes or image recipes", |
3232 | }, | 3234 | }, |
3233 | {'name': 'Last errors', 'clclass': 'lerrors', | 3235 | {'name': 'Errors', 'clclass': 'lerrors', |
3234 | 'qhelp': "How many errors were encountered during the last project build (if any)", | 3236 | 'qhelp': "How many errors were encountered during the last project build (if any)", |
3235 | }, | 3237 | }, |
3236 | {'name': 'Last warnings', 'clclass': 'lwarnings', | 3238 | {'name': 'Warnings', 'clclass': 'lwarnings', |
3237 | 'qhelp': "How many warnigns were encountered during the last project build (if any)", | 3239 | 'qhelp': "How many warnigns were encountered during the last project build (if any)", |
3238 | }, | 3240 | }, |
3239 | {'name': 'Last image files', 'clclass': 'limagefiles', 'hidden': 1, | 3241 | {'name': 'Image files', 'clclass': 'limagefiles', 'hidden': 1, |
3240 | 'qhelp': "The root file system types produced by the last project build", | 3242 | 'qhelp': "The root file system types produced by the last project build", |
3241 | }, | 3243 | }, |
3242 | ] | 3244 | ] |