From: Alexandru DAMIAN Date: Mon, 2 Dec 2013 15:58:31 +0000 (+0000) Subject: toaster: update to Django 1.5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d37a1731a2b681bc976f3f391d65abb7745b6f9;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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] Signed-off-by: Alexandru DAMIAN --- diff --git a/bin/toaster b/bin/toaster index d4715fa67b5..7e51014b7dd 100755 --- a/bin/toaster +++ b/bin/toaster @@ -87,8 +87,8 @@ BBBASEDIR=`dirname ${BASH_SOURCE}`/.. # Verify prerequisites -if ! echo "import django; print (1,4,5) == django.VERSION[0:3]" | python 2>/dev/null | grep True >/dev/null; then - echo -e "This program needs Django 1.4.5. Please install with\n\nsudo pip install django==1.4.5" +if ! echo "import django; print (1,5) == django.VERSION[0:2]" | python 2>/dev/null | grep True >/dev/null; then + echo -e "This program needs Django 1.5. Please install with\n\nsudo pip install django==1.5" return 2 fi diff --git a/lib/toaster/bldviewer/templates/base.html b/lib/toaster/bldviewer/templates/base.html index 101880d3ea8..d58cbeaed57 100644 --- a/lib/toaster/bldviewer/templates/base.html +++ b/lib/toaster/bldviewer/templates/base.html @@ -14,8 +14,8 @@
diff --git a/lib/toaster/bldviewer/templates/basebuildpage.html b/lib/toaster/bldviewer/templates/basebuildpage.html index 873f271babd..d590f28bc51 100644 --- a/lib/toaster/bldviewer/templates/basebuildpage.html +++ b/lib/toaster/bldviewer/templates/basebuildpage.html @@ -3,14 +3,14 @@ {% block pagename %}

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

{% endblock %} diff --git a/lib/toaster/bldviewer/templates/bpackage.html b/lib/toaster/bldviewer/templates/bpackage.html index ca092ca6a0e..07d079298e5 100644 --- a/lib/toaster/bldviewer/templates/bpackage.html +++ b/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/lib/toaster/bldviewer/templates/build.html b/lib/toaster/bldviewer/templates/build.html index 5f623504d5c..5653cca3572 100644 --- a/lib/toaster/bldviewer/templates/build.html +++ b/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/lib/toaster/bldviewer/templates/layer.html b/lib/toaster/bldviewer/templates/layer.html index fa4fd9bde84..c5034dea83d 100644 --- a/lib/toaster/bldviewer/templates/layer.html +++ b/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/lib/toaster/bldviewer/templates/package.html b/lib/toaster/bldviewer/templates/package.html index b1246e788a0..fda9dab0f0c 100644 --- a/lib/toaster/bldviewer/templates/package.html +++ b/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/lib/toaster/bldviewer/templates/task.html b/lib/toaster/bldviewer/templates/task.html index e7253698cdb..5d9887e848f 100644 --- a/lib/toaster/bldviewer/templates/task.html +++ b/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/lib/toaster/bldviewer/urls.py b/lib/toaster/bldviewer/urls.py index becc6792039..b84c95f08ba 100644 --- a/lib/toaster/bldviewer/urls.py +++ b/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/lib/toaster/toastermain/urls.py b/lib/toaster/toastermain/urls.py index d0606bce9ec..a696a0b216f 100644 --- a/lib/toaster/toastermain/urls.py +++ b/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')),