From d3d3a2c6ba71767e49a5b62fe74bf3b47688b911 Mon Sep 17 00:00:00 2001 From: Amit Kumar Chaudhary Date: Wed, 12 Mar 2014 18:47:42 +0000 Subject: [PATCH] bitbake: toaster: add errors and warnings listing Add the errors and warnings listing to the build dashboard page. (Bitbake rev: 2004c0fd1dd049d26279ee10a18e69e6852247fa) Signed-off-by: Amit Kumar Chaudhary Signed-off-by: Richard Purdie --- .../lib/toaster/toastergui/static/js/main.js | 20 +++++++ .../toastergui/templates/builddashboard.html | 56 ++++++++++++++++++- bitbake/lib/toaster/toastergui/views.py | 3 +- 3 files changed, 76 insertions(+), 3 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/static/js/main.js b/bitbake/lib/toaster/toastergui/static/js/main.js index c80f716edb..07aba3d86b 100644 --- a/bitbake/lib/toaster/toastergui/static/js/main.js +++ b/bitbake/lib/toaster/toastergui/static/js/main.js @@ -91,3 +91,23 @@ $(document).ready(function() { }); }); + +$(document).ready(function() { + //toggle the errors and warnings sections + $('.show-errors').click(function() { + $('#collapse-errors').addClass('in'); + }); + $('.toggle-errors').click(function() { + $('#collapse-errors').toggleClass('in'); + }); + $('.show-warnings').click(function() { + $('#collapse-warnings').addClass('in'); + }); + $('.toggle-warnings').click(function() { + $('#collapse-warnings').toggleClass('in'); + }); + //show warnings section when requested from the previous page + if (location.href.search('#warnings') > -1) { + $('#collapse-warnings').addClass('in'); + } +}); diff --git a/bitbake/lib/toaster/toastergui/templates/builddashboard.html b/bitbake/lib/toaster/toastergui/templates/builddashboard.html index b6506c73d0..763a28d1bf 100644 --- a/bitbake/lib/toaster/toastergui/templates/builddashboard.html +++ b/bitbake/lib/toaster/toastergui/templates/builddashboard.html @@ -18,10 +18,10 @@
{%if build.outcome == build.SUCCEEDED%}Completed{%elif build.outcome == build.FAILED%}Failed{%else%}{%endif%} {{build.completed_on|date:"d/m/y H:i"}} with {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %}{% if build.errors_no %} - {{build.errors_no}} error{{build.errors_no|pluralize}} + {{build.errors_no}} error{{build.errors_no|pluralize}} {% endif %} {% if build.warnings_no %} - {{build.warnings_no}} warning{{build.warnings_no|pluralize}} + {{build.warnings_no}} warning{{build.warnings_no|pluralize}} {% endif %} Build time: {{ build.timespent|sectohms }} {%endif%} @@ -29,6 +29,32 @@
+{% if build.errors_no %} +
+
+
+ +

+ + {{build.errors_no}} error{{build.errors_no|pluralize}} +

+ +
+
+
+
+ {% for error in logmessages %}{% if error.level == 2 %} +
+ 
{{error.message}}
+
+ {% endif %}{% endfor %} +
+
+
+
+
+{% endif %} + {%if build.outcome == build.SUCCEEDED%}
@@ -71,4 +97,30 @@
+{% if build.warnings_no %} +
+
+
+ +

+ + {{build.warnings_no}} warning{{build.warnings_no|pluralize}} +

+ +
+
+
+
+ {% for warning in logmessages %}{% if warning.level == 1 %} +
+ 
{{warning.message}}
+
+ {% endif %}{% endfor %} +
+
+
+
+
+{% endif %} + {% endblock %} diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index a499c30b62..7f61ade9c8 100644 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -356,7 +356,8 @@ def builddashboard(request, build_id): return redirect(builds) context = { 'build' : Build.objects.filter(pk=build_id)[0], - 'recipecount' : Recipe.objects.filter(layer_version__id__in=Layer_Version.objects.filter(build=build_id)).count() + 'recipecount' : Recipe.objects.filter(layer_version__id__in=Layer_Version.objects.filter(build=build_id)).count(), + 'logmessages' : LogMessage.objects.filter(build=build_id), } return render(request, template, context)