From 7fa51314bdac0afccf2ddd6f57581eec7d78d57f Mon Sep 17 00:00:00 2001 From: Dave Lerner Date: Fri, 21 Mar 2014 13:43:18 -0500 Subject: bitbake: toaster: format packages with size = -1 Packages that have a size of -1 are virtual packages with limited information. Such packages should be suppressed from the package list page for an image. On dependency and reverse dependency lists of package, such packages should appear in muted rows, without links, and with help information. The formatting rules are encapsulated into projecttags filters when possible to minimize tests on size==-1 in the templates. Testing the relevant pages with an HTML5 validator found a stray end tag in package_detail_base which has been fixed in this commit. [YOCTO #5966] (Bitbake rev: 6cdd4067f766ef5680076c33a32b2dc5d622362c) Signed-off-by: Dave Lerner Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- .../toastergui/templates/package_detail_base.html | 2 +- .../templates/package_included_dependencies.html | 19 ++++++++++++++++--- .../package_included_reverse_dependencies.html | 9 ++++++++- .../toaster/toastergui/templatetags/projecttags.py | 21 ++++++++++++++++++++- bitbake/lib/toaster/toastergui/views.py | 2 +- 5 files changed, 46 insertions(+), 7 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/templates/package_detail_base.html b/bitbake/lib/toaster/toastergui/templates/package_detail_base.html index 79f135cd92..6925aecb4d 100644 --- a/bitbake/lib/toaster/toastergui/templates/package_detail_base.html +++ b/bitbake/lib/toaster/toastergui/templates/package_detail_base.html @@ -97,8 +97,8 @@ # decision on index search algorithm - {% endcomment %} + {% endcomment %} {% endif %} diff --git a/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html b/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html index 71043ec1ac..c76774ac9c 100644 --- a/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html +++ b/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html @@ -23,12 +23,19 @@ {% for runtime_dep in runtime_deps %} - + + {% if runtime_dep.size != -1 %} {{runtime_dep.name}} + {% else %} + + {{runtime_dep.name|format_vpackage_namehelp}} + + {% endif %} + {{runtime_dep.version}} {{runtime_dep.size|filtered_filesizeformat}} @@ -58,12 +65,18 @@ {% for other_dep in other_deps %} {% if other_dep.installed %} - + + {% if other_dep.size != -1 %} - + {{other_dep.name}} + {% else %} + + {{other_dep.name|format_vpackage_namehelp}} + + {% endif %} {{other_dep.version}} {{other_dep.size|filtered_filesizeformat}} diff --git a/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html b/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html index 0eb39d3f4f..8653ae0fe2 100644 --- a/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html +++ b/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html @@ -28,12 +28,19 @@ {% for reverse_dep in reverse_deps|dictsort:"name" %} - + + {% if reverse_dep.size != -1 %} {{reverse_dep.name}} + {% else %} + + {{reverse_dep.name|format_vpackage_namehelp}} + + {% endif %} + {{reverse_dep.version}} {{reverse_dep.size|filtered_filesizeformat}} diff --git a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py index 12c2468fa1..34c3c21d20 100644 --- a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py +++ b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py @@ -110,8 +110,14 @@ def format_none_and_zero(value): @register.filter def filtered_filesizeformat(value): - """Change output from fileformatsize to suppress trailing '.0' and change 'bytes' to 'B' """ + If the value is -1 return an empty string. Otherwise, + change output from fileformatsize to suppress trailing '.0' + and change 'bytes' to 'B'. + """ + if value == -1: + return '' + return filesizeformat(value).replace("bytes", "B").replace(".0", "") @register.filter @@ -228,4 +234,17 @@ def filter_sizeovertotal(package_object, total_size): return '{:.1%}'.format(float(size)/float(total_size)) +from django.utils.safestring import mark_safe +@register.filter +def format_vpackage_rowclass(size): + if size == -1: + return mark_safe('class="muted"') + return '' +@register.filter +def format_vpackage_namehelp(name): + r = name + ' ' + r += '' + r += '' + return mark_safe(r) diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 92814cef15..d1234fe804 100644 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -425,7 +425,7 @@ def target(request, build_id, target_id): (filter_string, search_term, ordering_string) = _search_tuple(request, Package) # FUTURE: get rid of nested sub-queries replacing with ManyToMany field - queryset = Package.objects.filter(id__in=Target_Installed_Package.objects.filter(target_id=target_id).values('package_id')) + queryset = Package.objects.filter(size__gte=0, id__in=Target_Installed_Package.objects.filter(target_id=target_id).values('package_id')) packages_sum = queryset.aggregate(Sum('installed_size')) queryset = _get_queryset(Package, queryset, filter_string, search_term, ordering_string) packages = _build_page_range(Paginator(queryset, request.GET.get('count', 25)),request.GET.get('page', 1)) -- cgit v1.2.3-54-g00ecf