diff options
author | David Reyna <David.Reyna@windriver.com> | 2015-03-12 21:50:56 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-21 00:00:27 +0000 |
commit | 2f684f1bdc188fde5142ee95989994a7990984c5 (patch) | |
tree | 3c6f9f898f89ad237d6bcc3983ab16cf15353fec | |
parent | 8ff98c6c1b76c05ca9da7bfe379fd488be48db06 (diff) | |
download | ast2050-yocto-poky-2f684f1bdc188fde5142ee95989994a7990984c5.zip ast2050-yocto-poky-2f684f1bdc188fde5142ee95989994a7990984c5.tar.gz |
bitbake: toaster: Incorrect breadcrumb behaviour in the project page
The last item in the breadcrumb for the project page should not be a link.
[YOCTO #7157]
(Bitbake rev: 6966d68e650c2d5655a1e747e70d35f5f037dc94)
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/baseprojectpage.html | 6 | ||||
-rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html index e140925..0807f4c 100644 --- a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html +++ b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html @@ -11,10 +11,16 @@ <li><a href="{% url 'all-builds' %}">All builds</a></li> {% block parentbreadcrumb %} {% if project %} + {% if project_html %} + <li> + {{project.name}} + </li> + {% else %} <li> <a href="{%url 'project' project.id %}"><span id="project_name">{{project.name}}</span> </a> </li> + {% endif %} {% endif %} {% endblock %} {% block localbreadcrumb %}{% endblock %} diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index e87c9f2..661023e 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -2142,6 +2142,7 @@ if toastermain.settings.MANAGED: "targets" : map(lambda x: {"target" : x.target, "task" : x.task, "pk": x.pk}, prj.projecttarget_set.all()), "freqtargets": freqtargets, "releases": map(lambda x: {"id": x.pk, "name": x.name, "description":x.description}, Release.objects.all()), + "project_html": 1, } try: context["machine"] = {"name": prj.projectvariable_set.get(name="MACHINE").value} |