From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 066ABE00B66; Mon, 12 Oct 2015 09:14:01 -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 * [209.85.212.182 listed in list.dnswl.org] Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 15705E00AE9 for ; Mon, 12 Oct 2015 09:13:56 -0700 (PDT) Received: by wicge5 with SMTP id ge5so24074955wic.0 for ; Mon, 12 Oct 2015 09:13:56 -0700 (PDT) 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-type :content-transfer-encoding; bh=WCm7KV0AW89LPiDtE2RYsb76kMELSMZRd7X5LRv9OEY=; b=KdelIqOTbPqB58M92CI72qUVo23kfAEwIJX5w1sEakuCgMm9yz1deHogQsJYON8g8y LE4yc6JDfEvOZaUrmZ59YnT4qa+SU5XyJKmNZvYdNE3uIrc28BGw8E2kDPKrVRb88w3s IW/tie6wnl1E06dPHumGYOq3EFl3VwDdpBfqZBhrQjiXeYG3trvHyh7LdVodYEA818Ne vo9Y+vkt/7AKv3FYfjf+1csx3BMLEhADW63nr1Ja6xMiXUJLVjK7s68KNQ9mx2sGt1xV N292tlBDZy3TOgSyqPnkItQz9mFjxRsG6oYnO2UpuOWpd+8SP7I8+YCj4mz3keByPHXn +Tag== X-Gm-Message-State: ALoCoQmjgjUPaTM6IOblKJrzY712wBKqeSj4EFzgc1rjFSY/cDjbOiG5YjScpogkfb8Qz357zH2L X-Received: by 10.180.107.195 with SMTP id he3mr15897021wib.35.1444666435939; Mon, 12 Oct 2015 09:13:55 -0700 (PDT) Received: from [192.168.0.22] (0543d9db.skybroadband.com. [5.67.217.219]) by smtp.googlemail.com with ESMTPSA id h8sm11401890wib.21.2015.10.12.09.13.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Oct 2015 09:13:55 -0700 (PDT) To: "Barros Pena, Belen" , "toaster@yoctoproject.org" References: <1444153880-31556-1-git-send-email-michael.g.wood@intel.com> From: Michael Wood Message-ID: <561BDC42.6050200@intel.com> Date: Mon, 12 Oct 2015 17:13:54 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: Subject: Re: [PATCH] toaster: Fix missing tooltips from layers on project configuration page 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: Mon, 12 Oct 2015 16:14:01 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit Could someone review/merge this. I think it also fixes [YOCTO #3251 ] Michael On 07/10/15 11:57, Barros Pena, Belen wrote: > > On 06/10/2015 18:51, "toaster-bounces@yoctoproject.org on behalf of > Michael Wood" michael.g.wood@intel.com> wrote: > >> Re-enable the layer tooltips on the project configuration page. >> This adds the required fields to the API used for the layer dependencies >> to be able to show the metadata needed. >> >> [YOCTO #8295] > This works for me: tooltips are back :) > > Thanks! > > Belén > >> Signed-off-by: Michael Wood >> --- >> bitbake/lib/toaster/toastergui/static/js/projectpage.js | 5 +---- >> bitbake/lib/toaster/toastergui/views.py | 16 >> ++++++++++------ >> 2 files changed, 11 insertions(+), 10 deletions(-) >> >> diff --git a/bitbake/lib/toaster/toastergui/static/js/projectpage.js >> b/bitbake/lib/toaster/toastergui/static/js/projectpage.js >> index 95cef18..8d68ce1 100644 >> --- a/bitbake/lib/toaster/toastergui/static/js/projectpage.js >> +++ b/bitbake/lib/toaster/toastergui/static/js/projectpage.js >> @@ -146,10 +146,7 @@ function projectPageInit(ctx) { >> >> link.attr("href", layerObj.layerdetailurl); >> link.text(layerObj.name); >> - /* YOCTO #8024 >> - link.tooltip({title: layerObj.giturl + " | "+ >> layerObj.branch.name, placement: "right"}); >> - branch name not accessible sometimes it is revision instead >> - */ >> + link.tooltip({title: layerObj.vcs_url + " | "+ >> layerObj.vcs_reference, placement: "right"}); >> >> var trashItem = projectLayer.children("span"); >> trashItem.click(function (e) { >> diff --git a/bitbake/lib/toaster/toastergui/views.py >> b/bitbake/lib/toaster/toastergui/views.py >> index e07f0e2..2a9423b 100755 >> --- a/bitbake/lib/toaster/toastergui/views.py >> +++ b/bitbake/lib/toaster/toastergui/views.py >> @@ -2761,12 +2761,16 @@ if True: >> project = Project.objects.get(pk=pid) >> layer_version = Layer_Version.objects.get(pk=layerid) >> >> - context = { 'project' : project, >> - 'layerversion' : layer_version, >> - 'layerdeps' : {"list": [{"id": dep.id, "name": >> dep.layer.name} \ >> - for dep in >> layer_version.get_alldeps(project.id)]}, >> - 'projectlayers': map(lambda prjlayer: >> prjlayer.layercommit.id, ProjectLayer.objects.filter(project=project)) >> - } >> + context = {'project' : project, >> + 'layerversion' : layer_version, >> + 'layerdeps' : {"list": [{"id": dep.id, >> + "name": dep.layer.name, >> + "layerdetailurl": reverse('layerdetails', args=(pid, >> dep.pk)), >> + "vcs_url": dep.layer.vcs_url, >> + "vcs_reference": dep.get_vcs_reference()} \ >> + for dep in layer_version.get_alldeps(project.id)]}, >> + 'projectlayers': map(lambda prjlayer: >> prjlayer.layercommit.id, ProjectLayer.objects.filter(project=project)) >> + } >> >> return context >> >> -- >> 2.1.4 >> >> -- >> _______________________________________________ >> toaster mailing list >> toaster@yoctoproject.org >> https://lists.yoctoproject.org/listinfo/toaster