From 14a84434a1c76f5d0bef7a75f2c7529a9ff166cf Mon Sep 17 00:00:00 2001 From: Dave Lerner Date: Mon, 24 Mar 2014 16:37:17 -0500 Subject: bitbake: toaster: show installed package name [YOCTO #5922] Implement changes that show the installed package name after the official 'recipe-named' package name. If the alias exists and is different than the package name, then the alias is shown as a 'muted' string after the package name in the form 'as some-alias-name'. This formatting appears in the included package pages in the elements: * local breadcrumbs at the top of package included pages, *

title headings along with a help bubble that is not hovering, and * package lists where the help bubble appears when the mouse hovers over the row. The changes in detail in this patch per file are: views.py - added function that tests whether the package object's installed_name should be shown, - added function that appends package name with version and revision to encapsulate package name formatting in one place and referred to as package.fullpackagespec, - changed package_built* and package_included* functions to use both of the above new formatting functions, passing the formatted values to templates, and - adhered to django coding styles by renaming module local 'get_package*' functions with "_" prefix. package_detail_base.html - added display of package aliases for included package page, - refactored to use package.fullpackagespec, formatted by view function, - added javascript function to format package alias with help, and - removed trailing whitespace. package_included_detail.html - used javascript function above to format package alias, and - refactored to use package.fullpackagespec. package_included_dependencies.html - used javascript function above to format package alias, - refactored to use package.fullpackagespec, - forced empty data cells following hover-help to draw borders by appending space, and - removed trailing whitespace. package_included_reverse_dependencies.html - use javascript function above to format package alias, - refactor to use views fullpackagespe, and - force empty data cells following hover-help to draw borders by appending space. package_built_detail.html - refactored to use package.fullpackagespec, and - removed trailing whitespace. package_built_dependencies.html - refactored to use package.fullpackagespec, and - removed trailing whitespace. projecttags.py - removed unused filter to handle installed name - removed extra spaces around "title = " in format_vpackage_namehelp (Bitbake rev: c604e14df8cdb1f47535f093d7044955d4c2057d) Signed-off-by: Dave Lerner Signed-off-by: Richard Purdie --- .../templates/package_built_dependencies.html | 10 ++-- .../toastergui/templates/package_built_detail.html | 8 +-- .../toastergui/templates/package_detail_base.html | 36 ++++++++++--- .../templates/package_included_dependencies.html | 31 ++++++----- .../templates/package_included_detail.html | 14 +++-- .../package_included_reverse_dependencies.html | 17 +++--- .../toaster/toastergui/templatetags/projecttags.py | 10 +--- bitbake/lib/toaster/toastergui/views.py | 60 +++++++++++++++++----- 8 files changed, 121 insertions(+), 65 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html b/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html index 4932f74c88..a2011d6fb6 100644 --- a/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html +++ b/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html @@ -2,7 +2,6 @@ {% load projecttags %} {% block tabcontent %} - {% with fullPackageSpec=package.name|add:"-"|add:package.version|add:"-"|add:package.revision|filtered_packagespec %}