From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 68414E008CE; Thu, 19 Mar 2015 04:08:56 -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,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low * trust * [74.125.82.43 listed in list.dnswl.org] Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id B7D7EE00832 for ; Thu, 19 Mar 2015 04:08:52 -0700 (PDT) Received: by wgdm6 with SMTP id m6so59194858wgd.2 for ; Thu, 19 Mar 2015 04:08:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=GndhFQby04xI4HI0zcN8eGKCLnuNjlosm8PoqBGw8oM=; b=IoAkthxc/okvSHeEqQdDHwhqbgVSknB5JqD8S5Tisu7hqrnrAiPrgu8kLS+5rRCZEt 4qwTxQbqElGKkv8hNBD23sRl3gB1B3Eg1eFJmtNbSF1401ROSeSxB3xccFm5FP9A5kju 7tVz5gRynWL/GhoA7vlDFjeW3TSDo68UIO2BuVTG7DvMQ51fbaqvBTDbTbZVfupShbzb Ulk300vQkcaByHjAcIxxAnMkNQsWEXUnLM1or8msl35MAWMeTXHdVj80qcuX3yDiufFJ iHDRu4KhqgM0hW2p30mNJaz2Oc8Tg8fFqTGzwH/KRkxFhrjoQgGaXSaLh9wR6a8q1HKG MwjQ== X-Gm-Message-State: ALoCoQkVUxbleFEvKjKp8rgexZp/kxYEhSkFDDVBXzlKBr1xW1fIpQQzQ1UFAA2PtNgzYX/pgIa5 X-Received: by 10.180.14.196 with SMTP id r4mr15063462wic.77.1426763331649; Thu, 19 Mar 2015 04:08:51 -0700 (PDT) Received: from [192.168.2.70] ([83.217.123.106]) by mx.google.com with ESMTPSA id i10sm1481606wja.40.2015.03.19.04.08.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Mar 2015 04:08:51 -0700 (PDT) Message-ID: <550AAE43.2030405@intel.com> Date: Thu, 19 Mar 2015 11:08:51 +0000 From: Michael Wood User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: "toaster@yoctoproject.org" References: <1426508910-8249-1-git-send-email-michael.g.wood@intel.com> In-Reply-To: <1426508910-8249-1-git-send-email-michael.g.wood@intel.com> Subject: Re: [review-request][PATCH v2] bitbake: toaster: Project page fix project layers tooltip X-BeenThere: toaster@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Web based interface for BitBake List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Mar 2015 11:08:56 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Dropping this patch as it conflicts with work now merged for #7381 will submit a new reduced patch. On 16/03/15 12:28, Michael Wood wrote: > Make sure the tooltip for the project page shows correct vcs reference > by using the value of get_vcs_reference and align the tooltip on the > right. > > [YOCTO #7155] > > Signed-off-by: Michael Wood > --- > bitbake/lib/toaster/toastergui/templates/project.html | 2 +- > bitbake/lib/toaster/toastergui/views.py | 7 +++---- > 2 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html > index 54590ee..f677743 100644 > --- a/bitbake/lib/toaster/toastergui/templates/project.html > +++ b/bitbake/lib/toaster/toastergui/templates/project.html > @@ -293,7 +293,7 @@ vim: expandtab tabstop=2 > Import layer

> > diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py > index 8034cfc..5453c83 100755 > --- a/bitbake/lib/toaster/toastergui/views.py > +++ b/bitbake/lib/toaster/toastergui/views.py > @@ -2131,9 +2131,8 @@ if toastermain.settings.MANAGED: > "giturl": x.layercommit.layer.vcs_url, > "url": x.layercommit.layer.layer_index_url, > "layerdetailurl": reverse("layerdetails", args=(x.layercommit.pk,)), > - # This branch name is actually the release > - "branch" : { "name" : x.layercommit.commit, "layersource" : x.layercommit.up_branch.layer_source.name if x.layercommit.up_branch != None else None}}, > - prj.projectlayer_set.all().order_by("id")), > + "vcs_ref" : x.layercommit.get_vcs_reference() }, > + prj.projectlayer_set.all().order_by("id")), > "targets" : map(lambda x: {"target" : x.target, "task" : x.task, "pk": x.pk}, prj.projecttarget_set.all()), > "freqtargets": freqtargets, > "releases": map(lambda x: {"id": x.pk, "name": x.name, "description":x.description}, Release.objects.all()), > @@ -2254,7 +2253,7 @@ if toastermain.settings.MANAGED: > # return all project settings > return HttpResponse(jsonfilter( { > "error": "ok", > - "layers" : map(lambda x: {"id": x.layercommit.pk, "orderid" : x.pk, "name" : x.layercommit.layer.name, "giturl" : x.layercommit.layer.vcs_url, "url": x.layercommit.layer.layer_index_url, "layerdetailurl": reverse("layerdetails", args=(x.layercommit.layer.pk,)), "branch" : { "name" : x.layercommit.up_branch.name, "layersource" : x.layercommit.up_branch.layer_source.name}}, prj.projectlayer_set.all().select_related("layer").order_by("id")), > + "layers" : map(lambda x: {"id": x.layercommit.pk, "orderid" : x.pk, "name" : x.layercommit.layer.name, "giturl" : x.layercommit.layer.vcs_url, "url": x.layercommit.layer.layer_index_url, "layerdetailurl": reverse("layerdetails", args=(x.layercommit.layer.pk,)), "vcs_ref": x.layercommit.get_vcs_reference(), "branch" : { "name" : x.layercommit.up_branch.name, "layersource" : x.layercommit.up_branch.layer_source.name}}, prj.projectlayer_set.all().select_related("layer").order_by("id")), > "builds" : _project_recent_build_list(prj), > "variables": map(lambda x: (x.name, x.value), prj.projectvariable_set.all()), > "machine": {"name": prj.projectvariable_set.get(name="MACHINE").value},