From: Alexandru DAMIAN Date: Mon, 13 Jan 2014 17:03:41 +0000 (+0000) Subject: toaster: update Simple UI references to avoid conflict X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ed1a28eb0e52a6de83a37664ff6f4418ce84ee4;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Alexandru DAMIAN --- diff --git a/lib/toaster/bldviewer/templates/simple_base.html b/lib/toaster/bldviewer/templates/simple_base.html index d58cbeaed57..2d63dcdd106 100644 --- a/lib/toaster/bldviewer/templates/simple_base.html +++ b/lib/toaster/bldviewer/templates/simple_base.html @@ -14,8 +14,8 @@
diff --git a/lib/toaster/bldviewer/templates/simple_basebuildpage.html b/lib/toaster/bldviewer/templates/simple_basebuildpage.html index 8d64e2deb61..6cdc31d1984 100644 --- a/lib/toaster/bldviewer/templates/simple_basebuildpage.html +++ b/lib/toaster/bldviewer/templates/simple_basebuildpage.html @@ -3,14 +3,14 @@ {% block pagename %}

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

{% endblock %} diff --git a/lib/toaster/bldviewer/templates/simple_bpackage.html b/lib/toaster/bldviewer/templates/simple_bpackage.html index 37ceb623151..b7892f860a3 100644 --- a/lib/toaster/bldviewer/templates/simple_bpackage.html +++ b/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/lib/toaster/bldviewer/templates/simple_build.html b/lib/toaster/bldviewer/templates/simple_build.html index 985bcfdf8b3..ecd19df94ce 100644 --- a/lib/toaster/bldviewer/templates/simple_build.html +++ b/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/lib/toaster/bldviewer/templates/simple_layer.html b/lib/toaster/bldviewer/templates/simple_layer.html index 35dd99e2848..ae7172d9a0a 100644 --- a/lib/toaster/bldviewer/templates/simple_layer.html +++ b/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/lib/toaster/bldviewer/templates/simple_package.html b/lib/toaster/bldviewer/templates/simple_package.html index 29df0ca9a1b..2ac5d6616cf 100644 --- a/lib/toaster/bldviewer/templates/simple_package.html +++ b/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/lib/toaster/bldviewer/templates/simple_task.html b/lib/toaster/bldviewer/templates/simple_task.html index 3247ea94f50..cb6f309fefa 100644 --- a/lib/toaster/bldviewer/templates/simple_task.html +++ b/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/lib/toaster/bldviewer/urls.py b/lib/toaster/bldviewer/urls.py index b84c95f08ba..354b7296556 100644 --- a/lib/toaster/bldviewer/urls.py +++ b/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/')), )