CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-04 16:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: toaster: fix sorting after hiding a column in build tables

Browse Source 
When hiding a column in the build tasks or build packages included
table, if the column is set as the current order by for the table, the
order by is not reset to the default. The result is that the table
stays sorted by the hidden column.

Set the default_orderby for these two tables correctly to ensure the
corresponding table is re-sorted when a column is hidden, if that column
was being used as the order by.

[YOCTO #9011]

(Bitbake rev: b99e1012f0ad1dc82a769df15a232280c8e57b9e)

Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Elliot Smith 2016-04-19 17:28:39 +01:00 committed by Richard Purdie
parent 1b11b79f50
commit 040dbf6988
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitbake/lib/toaster/toastergui/templates/tasks.html
View File

@ -131,7 +131,7 @@
<script type="text/javascript">
$(document).ready(function() {
// enable blue hightlight animation for the order link
// highlight heading on the column for the field used for ordering
if (location.href.search('#') > -1) {
var task_order = location.href.split('#')[1];
$("#" + task_order).addClass("highlight");

50
bitbake/lib/toaster/toastergui/views.py
View File

@ -663,7 +663,9 @@ def recipe_packages(request, build_id, recipe_id):
def target_common( request, build_id, target_id, variant ):
template = "target.html"
(pagesize, orderby) = _get_parameters_values(request, 25, 'name:+')
default_orderby = 'name:+'
(pagesize, orderby) = _get_parameters_values(request, 25, default_orderby)
mandatory_parameters = { 'count': pagesize, 'page' : 1, 'orderby': orderby }
retval = _verify_parameters( request.GET, mandatory_parameters )
if retval:
@ -683,8 +685,6 @@ def target_common( request, build_id, target_id, variant ):
queryset = queryset.select_related("recipe", "recipe__layer_version", "recipe__layer_version__layer")
packages = _build_page_range( Paginator(queryset, pagesize), request.GET.get( 'page', 1 ))
build = Build.objects.get( pk = build_id )
# bring in package dependencies
@ -801,7 +801,7 @@ eans multiple licenses exist that cover different parts of the source',
'objects' : packages,
'packages_sum' : packages_sum[ 'installed_size__sum' ],
'object_search_display': "packages included",
'default_orderby' : orderby,
'default_orderby' : default_orderby,
'tablecols' : [
tc_package,
tc_packageVersion,
@ -996,29 +996,29 @@ def tasks_common(request, build_id, variant, task_anchor):
anchor=task_anchor
# default ordering depends on variant
if 'buildtime' == variant:
title_variant='Time'
object_search_display="time data"
filter_search_display="tasks"
(pagesize, orderby) = _get_parameters_values(request, 25, 'elapsed_time:-')
elif 'diskio' == variant:
title_variant='Disk I/O'
object_search_display="disk I/O data"
filter_search_display="tasks"
(pagesize, orderby) = _get_parameters_values(request, 25, 'disk_io:-')
elif 'cputime' == variant:
default_orderby = None
filter_search_display = 'tasks'
if 'buildtime' == variant:
default_orderby = 'elapsed_time:-'
title_variant = 'Time'
object_search_display = 'time data'
elif 'diskio' == variant:
default_orderby = 'disk_io:-'
title_variant = 'Disk I/O'
object_search_display = 'disk I/O data'
elif 'cputime' == variant:
default_orderby = 'cpu_time_system:-'
title_variant='CPU time'
object_search_display="CPU time data"
filter_search_display="tasks"
(pagesize, orderby) = _get_parameters_values(request, 25, 'cpu_time_system:-')
else :
title_variant='Tasks'
object_search_display="tasks"
filter_search_display="tasks"
(pagesize, orderby) = _get_parameters_values(request, 25, 'order:+')
object_search_display = 'CPU time data'
else:
default_orderby = 'order:+'
title_variant = 'Tasks'
object_search_display = 'tasks'
(pagesize, orderby) = _get_parameters_values(request, 25, default_orderby)
mandatory_parameters = { 'count': pagesize, 'page' : 1, 'orderby': orderby }
mandatory_parameters = {'count': pagesize, 'page' : 1, 'orderby': orderby}
template = 'tasks.html'
retval = _verify_parameters( request.GET, mandatory_parameters )
@ -1212,7 +1212,7 @@ def tasks_common(request, build_id, variant, task_anchor):
'mainheading': title_variant,
'build': build,
'objects': task_objects,
'default_orderby' : orderby,
'default_orderby' : default_orderby,
'search_term': search_term,
'total_count': queryset_with_search.count(),
'tablecols':[