diff options
-rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/projectpage.js | 5 | ||||
-rwxr-xr-x | 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 d36704751c..30989a016c 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) { | |||
146 | 146 | ||
147 | link.attr("href", layerObj.layerdetailurl); | 147 | link.attr("href", layerObj.layerdetailurl); |
148 | link.text(layerObj.name); | 148 | link.text(layerObj.name); |
149 | /* YOCTO #8024 | 149 | link.tooltip({title: layerObj.vcs_url + " | "+ layerObj.vcs_reference, placement: "right"}); |
150 | link.tooltip({title: layerObj.giturl + " | "+ layerObj.branch.name, placement: "right"}); | ||
151 | branch name not accessible sometimes it is revision instead | ||
152 | */ | ||
153 | 150 | ||
154 | var trashItem = projectLayer.children("span"); | 151 | var trashItem = projectLayer.children("span"); |
155 | trashItem.click(function (e) { | 152 | trashItem.click(function (e) { |
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 468cce3113..c4264a11a9 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -2768,12 +2768,16 @@ if True: | |||
2768 | project = Project.objects.get(pk=pid) | 2768 | project = Project.objects.get(pk=pid) |
2769 | layer_version = Layer_Version.objects.get(pk=layerid) | 2769 | layer_version = Layer_Version.objects.get(pk=layerid) |
2770 | 2770 | ||
2771 | context = { 'project' : project, | 2771 | context = {'project' : project, |
2772 | 'layerversion' : layer_version, | 2772 | 'layerversion' : layer_version, |
2773 | 'layerdeps' : {"list": [{"id": dep.id, "name": dep.layer.name} \ | 2773 | 'layerdeps' : {"list": [{"id": dep.id, |
2774 | for dep in layer_version.get_alldeps(project.id)]}, | 2774 | "name": dep.layer.name, |
2775 | 'projectlayers': map(lambda prjlayer: prjlayer.layercommit.id, ProjectLayer.objects.filter(project=project)) | 2775 | "layerdetailurl": reverse('layerdetails', args=(pid, dep.pk)), |
2776 | } | 2776 | "vcs_url": dep.layer.vcs_url, |
2777 | "vcs_reference": dep.get_vcs_reference()} \ | ||
2778 | for dep in layer_version.get_alldeps(project.id)]}, | ||
2779 | 'projectlayers': map(lambda prjlayer: prjlayer.layercommit.id, ProjectLayer.objects.filter(project=project)) | ||
2780 | } | ||
2777 | 2781 | ||
2778 | return context | 2782 | return context |
2779 | 2783 | ||