From 81ebce07788cd4c5f53cb6ad7b51ee3d6e52c881 Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Mon, 2 Dec 2013 15:58:31 +0000 Subject: bitbake: toaster: update to Django 1.5 In order to remain up to date with the relevant technologies, Toaster is updated with this patch to Django 1.5. This also makes headways to allow usage of emerging Django-related technologies. Changes include the startup script Django version check, usage of TemplateView instead of deprecated simple function to do redirects, and update to the new form of the _url_ template tag. Support for Django 1.4.5 is now deprecated. [YOCTO #5558] (Bitbake rev: 2d37a1731a2b681bc976f3f391d65abb7745b6f9) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- bitbake/lib/toaster/bldviewer/templates/base.html | 4 ++-- bitbake/lib/toaster/bldviewer/templates/basebuildpage.html | 8 ++++---- bitbake/lib/toaster/bldviewer/templates/bpackage.html | 4 ++-- bitbake/lib/toaster/bldviewer/templates/build.html | 4 ++-- bitbake/lib/toaster/bldviewer/templates/layer.html | 2 +- bitbake/lib/toaster/bldviewer/templates/package.html | 2 +- bitbake/lib/toaster/bldviewer/templates/task.html | 2 +- bitbake/lib/toaster/bldviewer/urls.py | 4 ++-- bitbake/lib/toaster/toastermain/urls.py | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/toaster/bldviewer/templates/base.html b/bitbake/lib/toaster/bldviewer/templates/base.html index 101880d3ea..d58cbeaed5 100644 --- a/bitbake/lib/toaster/bldviewer/templates/base.html +++ b/bitbake/lib/toaster/bldviewer/templates/base.html @@ -14,8 +14,8 @@
diff --git a/bitbake/lib/toaster/bldviewer/templates/basebuildpage.html b/bitbake/lib/toaster/bldviewer/templates/basebuildpage.html index 873f271bab..d590f28bc5 100644 --- a/bitbake/lib/toaster/bldviewer/templates/basebuildpage.html +++ b/bitbake/lib/toaster/bldviewer/templates/basebuildpage.html @@ -3,14 +3,14 @@ {% block pagename %}

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

{% endblock %} diff --git a/bitbake/lib/toaster/bldviewer/templates/bpackage.html b/bitbake/lib/toaster/bldviewer/templates/bpackage.html index ca092ca6a0..07d079298e 100644 --- a/bitbake/lib/toaster/bldviewer/templates/bpackage.html +++ b/bitbake/lib/toaster/bldviewer/templates/bpackage.html @@ -21,9 +21,9 @@ {% for package in packages %} - {{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%} + {{package.recipe.name}}{{package.package_name}} {{package.summary}} {{package.section}} diff --git a/bitbake/lib/toaster/bldviewer/templates/build.html b/bitbake/lib/toaster/bldviewer/templates/build.html index 5f623504d5..5653cca357 100644 --- a/bitbake/lib/toaster/bldviewer/templates/build.html +++ b/bitbake/lib/toaster/bldviewer/templates/build.html @@ -23,10 +23,10 @@ {% for build in builds %} - {{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/layer.html b/bitbake/lib/toaster/bldviewer/templates/layer.html index fa4fd9bde8..c5034dea83 100644 --- a/bitbake/lib/toaster/bldviewer/templates/layer.html +++ b/bitbake/lib/toaster/bldviewer/templates/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/package.html b/bitbake/lib/toaster/bldviewer/templates/package.html index b1246e788a..fda9dab0f0 100644 --- a/bitbake/lib/toaster/bldviewer/templates/package.html +++ b/bitbake/lib/toaster/bldviewer/templates/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/task.html b/bitbake/lib/toaster/bldviewer/templates/task.html index e7253698cd..5d9887e848 100644 --- a/bitbake/lib/toaster/bldviewer/templates/task.html +++ b/bitbake/lib/toaster/bldviewer/templates/task.html @@ -28,7 +28,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 becc679203..b84c95f08b 100644 --- a/bitbake/lib/toaster/bldviewer/urls.py +++ b/bitbake/lib/toaster/bldviewer/urls.py @@ -17,7 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. from django.conf.urls import patterns, include, url -from django.views.generic.simple import redirect_to +from django.views.generic import RedirectView urlpatterns = patterns('bldviewer.views', url(r'^builds/$', 'build', name='all-builds'), @@ -28,5 +28,5 @@ urlpatterns = patterns('bldviewer.views', 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'^$', redirect_to, {'url': 'builds/'}), + url(r'^$', RedirectView.as_view( url= 'builds/')), ) diff --git a/bitbake/lib/toaster/toastermain/urls.py b/bitbake/lib/toaster/toastermain/urls.py index d0606bce9e..a696a0b216 100644 --- a/bitbake/lib/toaster/toastermain/urls.py +++ b/bitbake/lib/toaster/toastermain/urls.py @@ -17,7 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. from django.conf.urls import patterns, include, url -from django.views.generic.simple import redirect_to +from django.views.generic import RedirectView from django.views.decorators.cache import never_cache @@ -29,7 +29,7 @@ urlpatterns = patterns('', url(r'^simple/', include('bldviewer.urls')), url(r'^api/1.0/', include('bldviewer.api')), url(r'^gui/', include('toastergui.urls')), - url(r'^$', never_cache(redirect_to), {'url': '/simple/'}), + url(r'^$', never_cache(RedirectView.as_view(url='/simple/'))), # Examples: # url(r'^toaster/', include('toaster.foo.urls')), -- cgit v1.2.3-54-g00ecf