[Toaster] [PATCH] toaster: Fix missing tooltips from layers on project configuration page

[Smith, Elliot]

On 13 October 2015 at 09:46, Smith, Elliot <elliot.smith at intel.com> wrote:

> On 12 October 2015 at 17:13, Michael Wood <michael.g.wood at intel.com>
> wrote:
>
>> Could someone review/merge this.  I think it also fixes [YOCTO #3251 <
>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=8251>]
>
>
I reviewed this, and confirmed it fixes 8251.

I have sent it upstream and added to toaster-next.

Elliot


>
> I'll look at this.
>
> Elliot
>
>
>>
>>
>> Michael
>>
>>
>> On 07/10/15 11:57, Barros Pena, Belen wrote:
>>
>>>
>>> On 06/10/2015 18:51, "toaster-bounces at yoctoproject.org on behalf of
>>> Michael Wood" <toaster-bounces at yoctoproject.org on behalf of
>>> michael.g.wood at 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 <michael.g.wood at intel.com>
>>>> ---
>>>> 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 at yoctoproject.org
>>>> https://lists.yoctoproject.org/listinfo/toaster
>>>>
>>>
>> --
>> _______________________________________________
>> toaster mailing list
>> toaster at yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/toaster
>>
>
>
>
> --
> Elliot Smith
> Software Engineer
> Intel Open Source Technology Centre
>



-- 
Elliot Smith
Software Engineer
Intel Open Source Technology Centre
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/toaster/attachments/20151013/5c95d979/attachment-0001.html>