toaster: Fix missing tooltips from layers on project configuration page
PATCH 1/1 toaster: Fix missing tooltips from layers on project configuration page
From: Michael Wood <[email protected]>
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]
Signed-off-by Michael Wood <[email protected]>
Signed-off-by Elliot Smith <[email protected]>
--- bitbake/lib/toaster/toastergui/static/js/projectpage.js | 5 +---- bitbake/lib/toaster/toastergui/views.py | 16 ++++++++++------ 2 files changed, 11 insertions(+), 10 deletions(-)
bitbake/lib/toaster/toastergui/static/js/projectpage.js +1 -4
@@ -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) {
bitbake/lib/toaster/toastergui/views.py +10 -6
@@ -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
Signature · 12 lines
1.9.3 --------------------------------------------------------------------- Intel Corporation (UK) Limited Registered No. 1134945 (England) Registered Office: Pipers Way, Swindon SN3 1RJ VAT No: 860 2173 47 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.