summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2014-09-03 14:20:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-05 10:14:24 +0100
commita287a6d9c195ac5a4242daa553c13896d523f69a (patch)
treee3cce73826152ca790a265530c7aed3828f23cc7
parenta44006262cf3b810ec78b4cccd8076102a7a0f3e (diff)
downloadpoky-a287a6d9c195ac5a4242daa553c13896d523f69a.tar.gz
bitbake: toaster: rename bldviewer projecttags custom tagset
We rename the projecttags in bldviewer.templatetags to simple_projecttags in order to avoid conflict with the similarly named tagset in toastergui. The conflict leads to an intermittent bug where proper tags are not read correctly since Django uses only the module name as global tag library identificator. (Bitbake rev: a37f2c194d7e59611177cb8755524b7ad702fe91) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/bldviewer/templates/simple_build.html2
-rw-r--r--bitbake/lib/toaster/bldviewer/templates/simple_layer.html2
-rw-r--r--bitbake/lib/toaster/bldviewer/templates/simple_recipe.html2
-rw-r--r--bitbake/lib/toaster/bldviewer/templatetags/simple_projecttags.py (renamed from bitbake/lib/toaster/bldviewer/templatetags/projecttags.py)0
4 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_build.html b/bitbake/lib/toaster/bldviewer/templates/simple_build.html
index a6983f5804..230e7c21ca 100644
--- a/bitbake/lib/toaster/bldviewer/templates/simple_build.html
+++ b/bitbake/lib/toaster/bldviewer/templates/simple_build.html
@@ -6,7 +6,7 @@
6 6
7{% block pagetable %} 7{% block pagetable %}
8 8
9 {% load projecttags %} 9 {% load simple_projecttags %}
10 <tr> 10 <tr>
11 <th>Outcome</th> 11 <th>Outcome</th>
12 <th>Started On</th> 12 <th>Started On</th>
diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_layer.html b/bitbake/lib/toaster/bldviewer/templates/simple_layer.html
index ae7172d9a0..25e7bf818e 100644
--- a/bitbake/lib/toaster/bldviewer/templates/simple_layer.html
+++ b/bitbake/lib/toaster/bldviewer/templates/simple_layer.html
@@ -5,7 +5,7 @@
5{% endblock %} 5{% endblock %}
6 6
7{% block pagetable %} 7{% block pagetable %}
8 {% load projecttags %} 8 {% load simple_projecttags %}
9 9
10 <tr> 10 <tr>
11 <th>Name</th> 11 <th>Name</th>
diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_recipe.html b/bitbake/lib/toaster/bldviewer/templates/simple_recipe.html
index 77b9de2525..3bff3b9a25 100644
--- a/bitbake/lib/toaster/bldviewer/templates/simple_recipe.html
+++ b/bitbake/lib/toaster/bldviewer/templates/simple_recipe.html
@@ -8,7 +8,7 @@
8{% endblock %} 8{% endblock %}
9 9
10{% block pagetable %} 10{% block pagetable %}
11 {% load projecttags %} 11 {% load simple_projecttags %}
12 12
13 <tr> 13 <tr>
14 </tr> 14 </tr>
diff --git a/bitbake/lib/toaster/bldviewer/templatetags/projecttags.py b/bitbake/lib/toaster/bldviewer/templatetags/simple_projecttags.py
index 1b8953c69d..1b8953c69d 100644
--- a/bitbake/lib/toaster/bldviewer/templatetags/projecttags.py
+++ b/bitbake/lib/toaster/bldviewer/templatetags/simple_projecttags.py