summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Lerner <dave.lerner@windriver.com>2014-04-11 17:19:28 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-20 14:58:08 +0100
commit6d0ae0ef440d5ec6dac5410e77bc52e5323e7cfb (patch)
tree89651384eca71daae5d887025363206dd70395aa
parent153787d4df9afc00d6d77506d2c4523bc9760f4a (diff)
downloadpoky-6d0ae0ef440d5ec6dac5410e77bc52e5323e7cfb.tar.gz
bitbake: toaster: fix span2 headings for packages
[YOCTO 6147] Fix bug in views.py that put 'span2' class id in a 'clclass' key instead of the 'dclass' key. This fix exposed another problem in target.html and the target view function that used 'package_size' instead of 'size' as the 'clclass' which is inconsistent with the model field name, causing table data columns to be shown when the header is hidden. (Bitbake rev: 17183bf7cb539287da7234d296da8e3f8fcf1069) Signed-off-by: Dave Lerner <dave.lerner@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/toastergui/templates/target.html2
-rw-r--r--bitbake/lib/toaster/toastergui/views.py9
2 files changed, 7 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/target.html b/bitbake/lib/toaster/toastergui/templates/target.html
index 3a0c4d7998..810d2baf24 100644
--- a/bitbake/lib/toaster/toastergui/templates/target.html
+++ b/bitbake/lib/toaster/toastergui/templates/target.html
@@ -79,7 +79,7 @@
79 {{package.version|filtered_packageversion:package.revision}} 79 {{package.version|filtered_packageversion:package.revision}}
80 </a> 80 </a>
81 </td> 81 </td>
82 <td class="package-size sizecol"> 82 <td class="size sizecol">
83 {{package.size|filtered_installedsize:package.installed_size|filtered_filesizeformat}} 83 {{package.size|filtered_installedsize:package.installed_size|filtered_filesizeformat}}
84 </td> 84 </td>
85 <td class="size_over_total sizecol"> 85 <td class="size_over_total sizecol">
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 3d2ed4c7c1..e3b24bace3 100644
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -575,13 +575,15 @@ def target(request, build_id, target_id):
575 'qhelp':'The size of the package', 575 'qhelp':'The size of the package',
576 'orderfield': _get_toggle_order(request, "size", True), 576 'orderfield': _get_toggle_order(request, "size", True),
577 'ordericon':_get_toggle_order_icon(request, "size"), 577 'ordericon':_get_toggle_order_icon(request, "size"),
578 'clclass': 'package_size span2', 578 'clclass': 'size',
579 'dclass' : 'span2',
579 'hidden' : 0, 580 'hidden' : 0,
580 }, 581 },
581 { 582 {
582 'name':'Size over total (%)', 583 'name':'Size over total (%)',
583 'qhelp':'Proportion of the overall included package size represented by this package', 584 'qhelp':'Proportion of the overall included package size represented by this package',
584 'clclass': 'size_over_total span2', 585 'clclass': 'size_over_total',
586 'dclass' : 'span2',
585 'hidden' : 1, 587 'hidden' : 1,
586 }, 588 },
587 { 589 {
@@ -1273,7 +1275,8 @@ def bpackage(request, build_id):
1273 'qhelp':'The size of the package', 1275 'qhelp':'The size of the package',
1274 'orderfield': _get_toggle_order(request, "size", True), 1276 'orderfield': _get_toggle_order(request, "size", True),
1275 'ordericon':_get_toggle_order_icon(request, "size"), 1277 'ordericon':_get_toggle_order_icon(request, "size"),
1276 'clclass': 'size span2', 'hidden': 0, 1278 'clclass': 'size', 'hidden': 0,
1279 'dclass' : 'span2',
1277 }, 1280 },
1278 { 1281 {
1279 'name':'License', 1282 'name':'License',