diff options
| author | Elliot Smith <elliot.smith@intel.com> | 2015-10-02 08:14:42 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-16 14:59:59 +0100 |
| commit | da4c6144f1125ac94f1ba515f97a433a983b7662 (patch) | |
| tree | 09f40037ea1bf5eca452d648aeeb8fa070540a9a /bitbake/lib/toaster/toastergui/templates/base.html | |
| parent | ef6fc2bc1a4eeafdf5eda112ffb72bfed24b85d5 (diff) | |
| download | poky-da4c6144f1125ac94f1ba515f97a433a983b7662.tar.gz | |
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>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates/base.html')
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/base.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html index 640bc47bcc..3f277909d7 100644 --- a/bitbake/lib/toaster/toastergui/templates/base.html +++ b/bitbake/lib/toaster/toastergui/templates/base.html | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | {% load static %} | 2 | {% load static %} |
| 3 | {% load projecttags %} | 3 | {% load projecttags %} |
| 4 | {% load project_url_tag %} | ||
| 4 | <html lang="en"> | 5 | <html lang="en"> |
| 5 | <head> | 6 | <head> |
| 6 | <title>{% if objectname %} {{objectname|title}} - {% endif %}Toaster</title> | 7 | <title>{% if objectname %} {{objectname|title}} - {% endif %}Toaster</title> |
| @@ -35,7 +36,7 @@ | |||
| 35 | projectsTypeAheadUrl: {% url 'xhr_projectstypeahead' as prjurl%}{{prjurl|json}}, | 36 | projectsTypeAheadUrl: {% url 'xhr_projectstypeahead' as prjurl%}{{prjurl|json}}, |
| 36 | {% if project.id %} | 37 | {% if project.id %} |
| 37 | projectId : {{project.id}}, | 38 | projectId : {{project.id}}, |
| 38 | projectPageUrl : {% url 'project' project.id as purl%}{{purl|json}}, | 39 | projectPageUrl : {% url 'project' project.id as purl %}{{purl|json}}, |
| 39 | projectName : {{project.name|json}}, | 40 | projectName : {{project.name|json}}, |
| 40 | recipesTypeAheadUrl: {% url 'xhr_recipestypeahead' project.id as paturl%}{{paturl|json}}, | 41 | recipesTypeAheadUrl: {% url 'xhr_recipestypeahead' project.id as paturl%}{{paturl|json}}, |
| 41 | layersTypeAheadUrl: {% url 'xhr_layerstypeahead' project.id as paturl%}{{paturl|json}}, | 42 | layersTypeAheadUrl: {% url 'xhr_layerstypeahead' project.id as paturl%}{{paturl|json}}, |
| @@ -133,7 +134,7 @@ | |||
| 133 | <h6>Project:</h6> | 134 | <h6>Project:</h6> |
| 134 | <span id="project"> | 135 | <span id="project"> |
| 135 | {% if project.id %} | 136 | {% if project.id %} |
| 136 | <a class="lead" href="{% url 'project' project.id %}">{{project.name}}</a> | 137 | <a class="lead" href="{% project_url project %}">{{project.name}}</a> |
| 137 | {% else %} | 138 | {% else %} |
| 138 | <a class="lead" href="#"></a> | 139 | <a class="lead" href="#"></a> |
| 139 | {% endif %} | 140 | {% endif %} |