From 3e1dbed33822dd949336022bc155cc5435719b38 Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Mon, 13 Jan 2014 17:03:41 +0000 Subject: [PATCH] bitbake: toaster: update Simple UI references to avoid conflict Since the Toaster GUI was cloned from the Simple UI, we need to update the URL pattern names in Simple UI to prevent conflict when determining the reverse URL path. (Bitbake rev: 6ed1a28eb0e52a6de83a37664ff6f4418ce84ee4) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- .../toaster/bldviewer/templates/simple_base.html | 4 ++-- .../templates/simple_basebuildpage.html | 8 ++++---- .../bldviewer/templates/simple_bpackage.html | 4 ++-- .../bldviewer/templates/simple_build.html | 4 ++-- .../bldviewer/templates/simple_layer.html | 2 +- .../bldviewer/templates/simple_package.html | 2 +- .../toaster/bldviewer/templates/simple_task.html | 2 +- bitbake/lib/toaster/bldviewer/urls.py | 16 ++++++++-------- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_base.html b/bitbake/lib/toaster/bldviewer/templates/simple_base.html index d58cbeaed5..2d63dcdd10 100644 --- a/bitbake/lib/toaster/bldviewer/templates/simple_base.html +++ b/bitbake/lib/toaster/bldviewer/templates/simple_base.html @@ -14,8 +14,8 @@
diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_basebuildpage.html b/bitbake/lib/toaster/bldviewer/templates/simple_basebuildpage.html index 8d64e2deb6..6cdc31d198 100644 --- a/bitbake/lib/toaster/bldviewer/templates/simple_basebuildpage.html +++ b/bitbake/lib/toaster/bldviewer/templates/simple_basebuildpage.html @@ -3,14 +3,14 @@ {% block pagename %}

Toaster - Build {% block pagetitle %} {% endblock %}

{% endblock %} diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_bpackage.html b/bitbake/lib/toaster/bldviewer/templates/simple_bpackage.html index 37ceb62315..b7892f860a 100644 --- a/bitbake/lib/toaster/bldviewer/templates/simple_bpackage.html +++ b/bitbake/lib/toaster/bldviewer/templates/simple_bpackage.html @@ -21,9 +21,9 @@ {% for package in objects %} - {{package.name}} ({{package.filelist_bpackage.count}} files) + {{package.name}} ({{package.filelist_bpackage.count}} files) {{package.version}}-{{package.revision}} - {%if package.recipe%}{{package.recipe.name}}{{package.package_name}}{%endif%} + {%if package.recipe%}{{package.recipe.name}}{{package.package_name}}{%endif%} {{package.summary}} {{package.section}} diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_build.html b/bitbake/lib/toaster/bldviewer/templates/simple_build.html index 985bcfdf8b..ecd19df94c 100644 --- a/bitbake/lib/toaster/bldviewer/templates/simple_build.html +++ b/bitbake/lib/toaster/bldviewer/templates/simple_build.html @@ -23,10 +23,10 @@ {% for build in objects %} - {{build.get_outcome_display}} + {{build.get_outcome_display}} {{build.started_on}} {{build.completed_on}} - {% for t in build.target_set.all %}{%if t.is_image %}{% endif %}{{t.target}}{% if t.is_image %}{% endif %}
{% endfor %} + {% for t in build.target_set.all %}{%if t.is_image %}{% endif %}{{t.target}}{% if t.is_image %}{% endif %}
{% endfor %} {{build.machine}} {% time_difference build.started_on build.completed_on %} {{build.errors_no}}:{% if build.errors_no %}{% for error in logs %}{% if error.build == build %}{% if error.level == 2 %}

{{error.message}}

{% endif %}{% endif %}{% endfor %}{% else %}None{% endif %} diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_layer.html b/bitbake/lib/toaster/bldviewer/templates/simple_layer.html index 35dd99e284..ae7172d9a0 100644 --- a/bitbake/lib/toaster/bldviewer/templates/simple_layer.html +++ b/bitbake/lib/toaster/bldviewer/templates/simple_layer.html @@ -23,7 +23,7 @@ {% for lv in layer.versions %} {% endfor %}
- ({{lv.priority}}){{lv.branch}}:{{lv.commit}} ({{lv.count}} recipes) + ({{lv.priority}}){{lv.branch}}:{{lv.commit}} ({{lv.count}} recipes)
diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_package.html b/bitbake/lib/toaster/bldviewer/templates/simple_package.html index 29df0ca9a1..2ac5d6616c 100644 --- a/bitbake/lib/toaster/bldviewer/templates/simple_package.html +++ b/bitbake/lib/toaster/bldviewer/templates/simple_package.html @@ -20,7 +20,7 @@ {{package.version}} {{package.size}} {%if package.recipe %} - {{package.recipe.name}}{{package.package_name}}{%endif%} + {{package.recipe.name}}{{package.package_name}}{%endif%}
{% for d in package.package_dependencies_source.all %} diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_task.html b/bitbake/lib/toaster/bldviewer/templates/simple_task.html index 3247ea94f5..cb6f309fef 100644 --- a/bitbake/lib/toaster/bldviewer/templates/simple_task.html +++ b/bitbake/lib/toaster/bldviewer/templates/simple_task.html @@ -27,7 +27,7 @@ {{task.order}} - {{task.recipe.name}}.{{task.task_name}} + {{task.recipe.name}}.{{task.task_name}} {{task.recipe.version}} {% if task.task_executed %} diff --git a/bitbake/lib/toaster/bldviewer/urls.py b/bitbake/lib/toaster/bldviewer/urls.py index b84c95f08b..354b729655 100644 --- a/bitbake/lib/toaster/bldviewer/urls.py +++ b/bitbake/lib/toaster/bldviewer/urls.py @@ -20,13 +20,13 @@ from django.conf.urls import patterns, include, url from django.views.generic import RedirectView urlpatterns = patterns('bldviewer.views', - url(r'^builds/$', 'build', name='all-builds'), - url(r'^build/(?P\d+)/task/$', 'task', name='task'), - url(r'^build/(?P\d+)/packages/$', 'bpackage', name='bpackage'), - url(r'^build/(?P\d+)/package/(?P\d+)/files/$', 'bfile', name='bfile'), - url(r'^build/(?P\d+)/target/(?P\d+)/packages/$', 'tpackage', name='tpackage'), - url(r'^build/(?P\d+)/configuration/$', 'configuration', name='configuration'), - url(r'^layers/$', 'layer', name='all-layers'), - url(r'^layerversions/(?P\d+)/recipes/.*$', 'layer_versions_recipes', name='layer_versions_recipes'), + url(r'^builds/$', 'build', name='simple-all-builds'), + url(r'^build/(?P\d+)/task/$', 'task', name='simple-task'), + url(r'^build/(?P\d+)/packages/$', 'bpackage', name='simple-bpackage'), + url(r'^build/(?P\d+)/package/(?P\d+)/files/$', 'bfile', name='simple-bfile'), + url(r'^build/(?P\d+)/target/(?P\d+)/packages/$', 'tpackage', name='simple-tpackage'), + url(r'^build/(?P\d+)/configuration/$', 'configuration', name='simple-configuration'), + url(r'^layers/$', 'layer', name='simple-all-layers'), + url(r'^layerversions/(?P\d+)/recipes/.*$', 'layer_versions_recipes', name='simple-layer_versions_recipes'), url(r'^$', RedirectView.as_view( url= 'builds/')), )