diff options
| author | Dave Lerner <dave.lerner@windriver.com> | 2014-04-11 17:19:28 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-08 16:18:12 +0100 |
| commit | 1a10bd3036b8943e2626ac6e033e1f9b21e1a571 (patch) | |
| tree | 24e6191485f67e8fcac97b05ca88c3b9faff27f6 | |
| parent | 12782678073b1605cc282a0a89e4ebb2e10a9be8 (diff) | |
| download | poky-1a10bd3036b8943e2626ac6e033e1f9b21e1a571.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: 436865ac8520c1d75401dde7df373dba9a386c9d)
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.html | 2 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/views.py | 9 |
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 86e46dcb1b..564fd27162 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', |
