summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorDavid Reyna <David.Reyna@windriver.com>2015-03-12 21:50:56 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-21 00:00:27 +0000
commit2f684f1bdc188fde5142ee95989994a7990984c5 (patch)
tree3c6f9f898f89ad237d6bcc3983ab16cf15353fec /bitbake
parent8ff98c6c1b76c05ca9da7bfe379fd488be48db06 (diff)
downloadpoky-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>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/toastergui/templates/baseprojectpage.html6
-rwxr-xr-xbitbake/lib/toaster/toastergui/views.py1
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 e1409252eb..0807f4cb1d 100644
--- a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html
+++ b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html
@@ -11,10 +11,16 @@
11 <li><a href="{% url 'all-builds' %}">All builds</a></li> 11 <li><a href="{% url 'all-builds' %}">All builds</a></li>
12 {% block parentbreadcrumb %} 12 {% block parentbreadcrumb %}
13 {% if project %} 13 {% if project %}
14 {% if project_html %}
15 <li>
16 {{project.name}}
17 </li>
18 {% else %}
14 <li> 19 <li>
15 <a href="{%url 'project' project.id %}"><span id="project_name">{{project.name}}</span> 20 <a href="{%url 'project' project.id %}"><span id="project_name">{{project.name}}</span>
16 </a> 21 </a>
17 </li> 22 </li>
23 {% endif %}
18 {% endif %} 24 {% endif %}
19 {% endblock %} 25 {% endblock %}
20 {% block localbreadcrumb %}{% endblock %} 26 {% block localbreadcrumb %}{% endblock %}
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index e87c9f2890..661023e523 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -2142,6 +2142,7 @@ if toastermain.settings.MANAGED:
2142 "targets" : map(lambda x: {"target" : x.target, "task" : x.task, "pk": x.pk}, prj.projecttarget_set.all()), 2142 "targets" : map(lambda x: {"target" : x.target, "task" : x.task, "pk": x.pk}, prj.projecttarget_set.all()),
2143 "freqtargets": freqtargets, 2143 "freqtargets": freqtargets,
2144 "releases": map(lambda x: {"id": x.pk, "name": x.name, "description":x.description}, Release.objects.all()), 2144 "releases": map(lambda x: {"id": x.pk, "name": x.name, "description":x.description}, Release.objects.all()),
2145 "project_html": 1,
2145 } 2146 }
2146 try: 2147 try:
2147 context["machine"] = {"name": prj.projectvariable_set.get(name="MACHINE").value} 2148 context["machine"] = {"name": prj.projectvariable_set.get(name="MACHINE").value}