diff options
author | David Reyna <David.Reyna@windriver.com> | 2017-11-30 00:55:24 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-18 15:05:29 +0000 |
commit | 4422d911200bdb3e85d6c2e7ce287573a8007e87 (patch) | |
tree | d0124fe9fdd41a4747f65053461db41ab8a098e5 /bitbake/lib/toaster | |
parent | 7f7154dda9c6c342b7e671a7916659238453d661 (diff) | |
download | poky-4422d911200bdb3e85d6c2e7ce287573a8007e87.tar.gz |
bitbake: toaster: update Toaster for Django 1.11
Toaster needs to accomodate API changes in Django 1.11.
[YOCTO #12192]
(Bitbake rev: 1b34e3c0075b4bb8a4800fef3e12c3f39743973c)
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster')
-rw-r--r-- | bitbake/lib/toaster/bldcollector/urls.py | 2 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/urls.py | 2 | ||||
-rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 2 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastermain/settings.py | 2 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastermain/urls.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/bldcollector/urls.py b/bitbake/lib/toaster/bldcollector/urls.py index 076afdb722..ed379bfb0c 100644 --- a/bitbake/lib/toaster/bldcollector/urls.py +++ b/bitbake/lib/toaster/bldcollector/urls.py | |||
@@ -17,7 +17,7 @@ | |||
17 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 17 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
18 | 18 | ||
19 | 19 | ||
20 | from django.conf.urls import patterns, include, url | 20 | from djaV2 ngo.conf.urls import include, url |
21 | 21 | ||
22 | import bldcollector.views | 22 | import bldcollector.views |
23 | 23 | ||
diff --git a/bitbake/lib/toaster/toastergui/urls.py b/bitbake/lib/toaster/toastergui/urls.py index 3ad5566b1d..e07b0efc1f 100644 --- a/bitbake/lib/toaster/toastergui/urls.py +++ b/bitbake/lib/toaster/toastergui/urls.py | |||
@@ -16,7 +16,7 @@ | |||
16 | # with this program; if not, write to the Free Software Foundation, Inc., | 16 | # with this program; if not, write to the Free Software Foundation, Inc., |
17 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 17 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
18 | 18 | ||
19 | from django.conf.urls import patterns, include, url | 19 | from django.conf.urls import include, url |
20 | from django.views.generic import RedirectView, TemplateView | 20 | from django.views.generic import RedirectView, TemplateView |
21 | 21 | ||
22 | from django.http import HttpResponseBadRequest | 22 | from django.http import HttpResponseBadRequest |
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 334bb4a2e9..209b07dad8 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -277,7 +277,7 @@ def _validate_input(field_input, model): | |||
277 | return None, invalid + str(field_input_list) | 277 | return None, invalid + str(field_input_list) |
278 | 278 | ||
279 | # Check we are looking for a valid field | 279 | # Check we are looking for a valid field |
280 | valid_fields = model._meta.get_all_field_names() | 280 | valid_fields = [f.name for f in model._meta.get_fields()] |
281 | for field in field_input_list[0].split(AND_VALUE_SEPARATOR): | 281 | for field in field_input_list[0].split(AND_VALUE_SEPARATOR): |
282 | if True in [field.startswith(x) for x in valid_fields]: | 282 | if True in [field.startswith(x) for x in valid_fields]: |
283 | break | 283 | break |
diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py index 54ab31f302..13541d380f 100644 --- a/bitbake/lib/toaster/toastermain/settings.py +++ b/bitbake/lib/toaster/toastermain/settings.py | |||
@@ -186,7 +186,7 @@ TEMPLATES = [ | |||
186 | 'django.template.context_processors.tz', | 186 | 'django.template.context_processors.tz', |
187 | 'django.contrib.messages.context_processors.messages', | 187 | 'django.contrib.messages.context_processors.messages', |
188 | # Custom | 188 | # Custom |
189 | 'django.core.context_processors.request', | 189 | 'django.template.context_processors.request', |
190 | 'toastergui.views.managedcontextprocessor', | 190 | 'toastergui.views.managedcontextprocessor', |
191 | 191 | ||
192 | ], | 192 | ], |
diff --git a/bitbake/lib/toaster/toastermain/urls.py b/bitbake/lib/toaster/toastermain/urls.py index 6750bdf3aa..e2fb0aebfd 100644 --- a/bitbake/lib/toaster/toastermain/urls.py +++ b/bitbake/lib/toaster/toastermain/urls.py | |||
@@ -19,7 +19,7 @@ | |||
19 | # with this program; if not, write to the Free Software Foundation, Inc., | 19 | # with this program; if not, write to the Free Software Foundation, Inc., |
20 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 20 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
21 | 21 | ||
22 | from django.conf.urls import patterns, include, url | 22 | from django.conf.urls import include, url |
23 | from django.views.generic import RedirectView, TemplateView | 23 | from django.views.generic import RedirectView, TemplateView |
24 | from django.views.decorators.cache import never_cache | 24 | from django.views.decorators.cache import never_cache |
25 | import bldcollector.views | 25 | import bldcollector.views |