sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: toaster: Make the builds view the project page for "command line builds" 

Command line builds don't have configuration or layers which can
be manipulated in Toaster, so these pages shouldn't be visible.
However, the configuration page is the default page for the
project view (/project/X/), which isn't correct for the
command line builds project.

Modify all project page links across the application so that
the command line builds project (aka the "default" project)
always displays the builds tab.

Add a project_url tag for templates which contains the logic
determining where the URL for a project links to, based on
whether it is the default project or not.

[YOCTO #8231]

(Bitbake rev: 3ea10f4c16a557e94781251f6776b13acb8e9eba)

Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Elliot Smith 2015-10-02 08:14:42 +01:00 committed by Richard Purdie
parent ef6fc2bc1a
commit da4c6144f1
6 changed files with 82 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bitbake/lib/toaster/toastergui/templates/base.html
View File

@ -1,6 +1,7 @@
<!DOCTYPE html>
{% load static %}
{% load projecttags %}
{% load project_url_tag %}
<html lang="en">
<head>
<title>{% if objectname %} {{objectname|title}} - {% endif %}Toaster</title>
@ -35,7 +36,7 @@
projectsTypeAheadUrl: {% url 'xhr_projectstypeahead' as prjurl%}{{prjurl|json}},
{% if project.id %}
projectId : {{project.id}},
projectPageUrl : {% url 'project' project.id as purl%}{{purl|json}},
projectPageUrl : {% url 'project' project.id as purl %}{{purl|json}},
projectName : {{project.name|json}},
recipesTypeAheadUrl: {% url 'xhr_recipestypeahead' project.id as paturl%}{{paturl|json}},
layersTypeAheadUrl: {% url 'xhr_layerstypeahead' project.id as paturl%}{{paturl|json}},
@ -133,7 +134,7 @@
<h6>Project:</h6>
<span id="project">
{% if project.id %}
<a class="lead" href="{% url 'project' project.id %}">{{project.name}}</a>
<a class="lead" href="{% project_url project %}">{{project.name}}</a>
{% else %}
<a class="lead" href="#"></a>
{% endif %}

3
bitbake/lib/toaster/toastergui/templates/builds.html
View File

@ -2,6 +2,7 @@
{% load static %}
{% load projecttags %}
{% load project_url_tag %}
{% load humanize %}
{% block extraheadcontent %}
@ -104,7 +105,7 @@
{% endif %}
</td>
<td>
<a href="{% url 'project' build.project.id %}">{{build.project.name}}</a>
<a href="{% project_url build.project %}">{{build.project.name}}</a>
</td>
</tr>

6
bitbake/lib/toaster/toastergui/templates/mrb_section.html
View File

@ -1,8 +1,8 @@
{% load static %}
{% load projecttags %}
{% load project_url_tag %}
{% load humanize %}
{%if mru and mru.count > 0%}
{%if mrb_type == 'project' %}
@ -22,7 +22,7 @@
{% if mrb_type != 'project' %}
project-name">
<span class="label {%if build.outcome == build.SUCCEEDED%}label-success{%elif build.outcome == build.FAILED%}label-important{%else%}label-info{%endif%}">
<a href={% url 'project' build.project.pk %}>
<a href={% project_url build.project %}>
{{build.project.name}}
</a>
</span>
@ -106,7 +106,7 @@
pull-right"
onclick='scheduleBuild({% url 'projectbuilds' build.project.id as bpi %}{{bpi|json}},
{{build.project.name|json}},
{% url 'project' build.project.id as bpurl %}{{bpurl|json}},
{% url 'project' build.project.id as purl %}{{purl|json}},
{{build.target_set.all|get_tasks|json}})'>
Run again

7
bitbake/lib/toaster/toastergui/templates/projects.html
View File

@ -2,6 +2,7 @@
{% load static %}
{% load projecttags %}
{% load project_url_tag %}
{% load humanize %}
{% block pagecontent %}
@ -37,8 +38,10 @@
{% include "basetable_top.html" %}
{% for o in objects %}
<tr class="data" data-project="{{ o.id }}">
<td><a href="{% url 'project' o.id %}">{{o.name}}</a></td>
<td class="updated"><a href="{% url 'project' o.id %}">{{o.updated|date:"d/m/y H:i"}}</a></td>
<td data-project-field="name">
<a href="{% project_url o %}">{{o.name}}</a>
</td>
<td class="updated"><a href="{% project_url o %}">{{o.updated|date:"d/m/y H:i"}}</a></td>
<td data-project-field="release">
{% if o.release %}
<a href="{% url 'project' o.id %}#project-details">{{o.release.name}}</a>

34
bitbake/lib/toaster/toastergui/templatetags/project_url_tag.py Normal file
View File

@ -0,0 +1,34 @@
from django import template
from django.core.urlresolvers import reverse
register = template.Library()
def project_url(parser, token):
"""
Create a URL for a project's main page;
for non-default projects, this is the configuration page;
for the default project, this is the project builds page
"""
try:
tag_name, project = token.split_contents()
except ValueError:
raise template.TemplateSyntaxError(
"%s tag requires exactly one argument" % tag_name
)
return ProjectUrlNode(project)
class ProjectUrlNode(template.Node):
def __init__(self, project):
self.project = template.Variable(project)
def render(self, context):
try:
project = self.project.resolve(context)
if project.is_default:
return reverse('projectbuilds', args=(project.id,))
else:
return reverse('project', args=(project.id,))
except template.VariableDoesNotExist:
return ''
register.tag('project_url', project_url)

38
bitbake/lib/toaster/toastergui/tests.py
View File

@ -428,8 +428,8 @@ class LandingPageTests(TestCase):
self.assertTrue('/builds' in response.url,
'should redirect to builds')
class ProjectsPageTests(TestCase):
""" Tests for projects page """
class AllProjectsPageTests(TestCase):
""" Tests for projects page /projects/ """
MACHINE_NAME = 'delorean'
@ -554,6 +554,38 @@ class ProjectsPageTests(TestCase):
self.assertEqual(text, self.MACHINE_NAME,
'machine name should be shown for non-default project')
def test_project_page_links(self):
"""
Test that links for the default project point to the builds
page /projects/X/builds for that project, and that links for
other projects point to their configuration pages /projects/X/
"""
# need a build, otherwise project doesn't display at all
self._add_build_to_default_project()
# another project to test, which should show machine
self._add_non_default_project()
response = self.client.get(reverse('all-projects'), follow=True)
soup = BeautifulSoup(response.content)
# link for default project
row = soup.find('tr', attrs={'data-project': self.default_project.id})
cell = row.find('td', attrs={'data-project-field': 'name'})
url = cell.find('a')['href']
expected_url = reverse('projectbuilds', args=(self.default_project.id,))
self.assertEqual(url, expected_url,
'link on default project name should point to builds')
# link for other project
row = soup.find('tr', attrs={'data-project': self.project.id})
cell = row.find('td', attrs={'data-project-field': 'name'})
url = cell.find('a')['href']
expected_url = reverse('project', args=(self.project.id,))
self.assertEqual(url, expected_url,
'link on project name should point to configuration')
class ProjectBuildsPageTests(TestCase):
""" Test data at /project/X/builds is displayed correctly """
@ -650,7 +682,7 @@ class ProjectBuildsPageTests(TestCase):
self.assertEqual(len(result), 2)
class AllBuildsPageTests(TestCase):
""" Tests for all builds page """
""" Tests for all builds page /builds/ """
def setUp(self):
bbv = BitbakeVersion.objects.create(name="bbv1", giturl="/tmp/",