From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <michael.g.wood@intel.com>
Received: by yocto-www.yoctoproject.org (Postfix, from userid 118)
	id E617CE00F87; Tue, 19 Apr 2016 09:32:16 -0700 (PDT)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	yocto-www.yoctoproject.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1
X-Spam-HAM-Report: * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at
	http://www.dnswl.org/, low *      trust
	*      [74.125.82.42 listed in list.dnswl.org]
	* -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%
	*      [score: 0.0000]
	*  0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily
	*      valid
	* -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature
Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42])
	by yocto-www.yoctoproject.org (Postfix) with ESMTP id 69E94E00AE4
	for <toaster@yoctoproject.org>; Tue, 19 Apr 2016 09:32:13 -0700 (PDT)
Received: by mail-wm0-f42.google.com with SMTP id e201so20610042wme.0
	for <toaster@yoctoproject.org>; Tue, 19 Apr 2016 09:32:13 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=intel-com.20150623.gappssmtp.com; s=20150623;
	h=subject:to:references:from:message-id:date:user-agent:mime-version
	:in-reply-to:content-transfer-encoding;
	bh=TW65kKxh4KWOfiVPt92EICOB3oczmWOQ+yJQVrzpLbM=;
	b=VY31BSyz9R+MOAjc/1ry6tij5duM4xN1BeskqFejYi9p7BhPFrK/Gh8RMqpncX1RYi
	E8a+wplRpCSyZ94s5VfGstZSJ3AmeYHMfa/iF33+hb8czgldP0PkfKmSm8T9yzxj1eoK
	1dIiTIRM2zxk3EDkuLGXFh+3OYOsXYF7a8JrcOK+tuUSeNssluTVoA5qb3BJsp3F4FpB
	2wun7ZOo4tzhJhNtKdrcHXHAN0WPdGTtt10o6xhFD/o+meLp543r5X9UuuI11bHZLDDn
	Ofmf8TDj/sX+wC7SvjP6VVRPFGA6GtmlaGr/Dv+289rwHSM1VSRdalJ+/VnjkMPiz7pd
	vVLA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:subject:to:references:from:message-id:date
	:user-agent:mime-version:in-reply-to:content-transfer-encoding;
	bh=TW65kKxh4KWOfiVPt92EICOB3oczmWOQ+yJQVrzpLbM=;
	b=St3Ze3NMaduof9pn+vhHadFi+b+B3/Qw4bzHiQ1KrJ3nuuAeKzyXfwQaGluQ0wa0+b
	i++zLCzH3TvHGdQkgsohXtxi9wd6XRS90ix/rCk4dW0yUoy+yt46y3dGt6wToBHgRHBU
	vasWEdmOM8Irl/tr5JOsCcRabx3SmG5YVGGKQlquC8e5QOIRweZcgWY+MqqOAn/i1jM7
	FdDGCh7CksqIR85IJS8FYy96NKD67LmjYd5i5k/eNS02b3YLF6CqUkNaK2irrtXbYmkT
	//OZtZgwXMYxEFlymKmbNRhKt/Kv5q2q/x0o9P4rPfdatqougU1RnNJ6wlv85SqRIinE
	VBxg==
X-Gm-Message-State: AOPr4FW5Sabb79a0qgIusCV7R0h1iyqfBWPV+nM3+rrpuIeyUElyGRPBstmFyDd+DT3ry8cX
X-Received: by 10.28.13.141 with SMTP id 135mr26429225wmn.12.1461083532340;
	Tue, 19 Apr 2016 09:32:12 -0700 (PDT)
Received: from [192.168.0.83]
	(host109-150-176-203.range109-150.btcentralplus.com.
	[109.150.176.203]) by smtp.googlemail.com with ESMTPSA id
	w3sm1113670wjt.0.2016.04.19.09.32.11 for <toaster@yoctoproject.org>
	(version=TLSv1/SSLv3 cipher=OTHER);
	Tue, 19 Apr 2016 09:32:11 -0700 (PDT)
To: toaster@yoctoproject.org
References: <1459242431-17140-1-git-send-email-elliot.smith@intel.com>
	<1459242431-17140-3-git-send-email-elliot.smith@intel.com>
From: Michael Wood <michael.g.wood@intel.com>
Message-ID: <57165D8B.9010808@intel.com>
Date: Tue, 19 Apr 2016 17:32:11 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
	Thunderbird/38.6.0
MIME-Version: 1.0
In-Reply-To: <1459242431-17140-3-git-send-email-elliot.smith@intel.com>
Subject: Re: [PATCH 2/2] toaster: fix sorting after hiding a column in build tables
X-BeenThere: toaster@yoctoproject.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: Web based interface for BitBake <toaster.yoctoproject.org>
List-Unsubscribe: <https://lists.yoctoproject.org/options/toaster>,
	<mailto:toaster-request@yoctoproject.org?subject=unsubscribe>
List-Archive: <http://lists.yoctoproject.org/pipermail/toaster>
List-Post: <mailto:toaster@yoctoproject.org>
List-Help: <mailto:toaster-request@yoctoproject.org?subject=help>
List-Subscribe: <https://lists.yoctoproject.org/listinfo/toaster>,
	<mailto:toaster-request@yoctoproject.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Apr 2016 16:32:17 -0000
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit

Sent to bitbake-devel and added to toaster-next

Thanks,

Michael

On 29/03/16 10:07, Elliot Smith wrote:
> 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]
>
> Signed-off-by: Elliot Smith <elliot.smith@intel.com>
> ---
>   .../lib/toaster/toastergui/templates/tasks.html    |  2 +-
>   bitbake/lib/toaster/toastergui/views.py            | 50 +++++++++++-----------
>   2 files changed, 26 insertions(+), 26 deletions(-)
>
> diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/bitbake/lib/toaster/toastergui/templates/tasks.html
> index 23eb957..84bc103 100644
> --- a/bitbake/lib/toaster/toastergui/templates/tasks.html
> +++ b/bitbake/lib/toaster/toastergui/templates/tasks.html
> @@ -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");
> diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
> index cc7ad17..71c74e2 100755
> --- a/bitbake/lib/toaster/toastergui/views.py
> +++ b/bitbake/lib/toaster/toastergui/views.py
> @@ -662,7 +662,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:
> @@ -682,8 +684,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
> @@ -800,7 +800,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,
> @@ -995,29 +995,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 )
> @@ -1211,7 +1211,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':[