mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-05 20:27:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: toaster: Fix missing tooltips from layers on project configuration page

Browse Source 
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.

Also fixes link hrefs which were missing in the add layers confirmation
dialog (bug 8251).

[YOCTO #8295]
[YOCTO #8251]

(Bitbake rev: c7cb8255d0ab1fd7715e878c1c83ef0cd920387e)

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Michael Wood
2015-10-13 09:58:49 +01:00
committed by Richard Purdie
parent 7e5464b451
commit d302c98822
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bitbake/lib/toaster/toastergui/static/js/projectpage.js
View File

@@ -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) {

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

@@ -2768,12 +2768,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