On 11/08/2015 15:45, "[email protected] on behalf of Michael Wood" <[email protected] on behalf of [email protected]> wrote:
>Adds back the tooltip for layers on the new project configuration page. This is looking good from the UI side. Thanks! Belén > >Signed-off-by: Michael Wood <[email protected]> >--- > bitbake/lib/toaster/toastergui/static/js/projectpage.js | 6 ++---- > bitbake/lib/toaster/toastergui/views.py | 7 ++++++- > 2 files changed, 8 insertions(+), 5 deletions(-) > >diff --git a/bitbake/lib/toaster/toastergui/static/js/projectpage.js >b/bitbake/lib/toaster/toastergui/static/js/projectpage.js >index 146319e..feca227 100644 >--- a/bitbake/lib/toaster/toastergui/static/js/projectpage.js >+++ b/bitbake/lib/toaster/toastergui/static/js/projectpage.js >@@ -146,10 +146,8 @@ 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 7f52513..6f0b9b5 100755 >--- a/bitbake/lib/toaster/toastergui/views.py >+++ b/bitbake/lib/toaster/toastergui/views.py >@@ -2619,7 +2619,12 @@ if True: > context = { 'project' : project, > 'layerversion' : layer_version, > 'layerdeps' : { "list": [ >- [{"id": y.id, "name": y.layer.name} for y in >x.depends_on.get_equivalents_wpriority(project)][0] for x in >layer_version.dependencies.all()]}, >+ [{"id": y.id, >+ "name": y.layer.name, >+ "layerdetailurl" : y.get_detailspage_url(pid), >+ "vcs_url" : y.layer.vcs_url, >+ "vcs_reference" :y.get_vcs_reference()} >+ for y in >x.depends_on.get_equivalents_wpriority(project)][0] for x in >layer_version.dependencies.all()]}, > 'projectlayers': map(lambda prjlayer: >prjlayer.layercommit.id, ProjectLayer.objects.filter(project=project)) > } > >-- >2.1.4 > >-- >_______________________________________________ >toaster mailing list >[email protected] >https://lists.yoctoproject.org/listinfo/toaster -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
