summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2015-05-12 15:34:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-14 18:04:09 +0100
commit2ac26e4294a029075071a8c6cfd5c2bdea801337 (patch)
treeebf6fb73396d3dc101d90574116f7f9d31a562bc
parentec8bd70b27efe7875f0c536c4eaf185eae9f7670 (diff)
downloadpoky-2ac26e4294a029075071a8c6cfd5c2bdea801337.tar.gz
bitbake: toaster: managedcontextprocessor requires Project imported
Temporarily move this import into the main view so that the context processor can return a value for projects (albeit an unused one) when in non managed mode. This will be changed in the near future but this will fix it until we finish the refactoring. (Bitbake rev: db61587fdd78af071d8a2a50d494fe159bf169a6) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/lib/toaster/toastergui/views.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 44f33beba6..c22f2c1aba 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -1795,6 +1795,7 @@ def managedcontextprocessor(request):
1795 1795
1796import toastermain.settings 1796import toastermain.settings
1797 1797
1798from orm.models import Project, ProjectLayer, ProjectTarget, ProjectVariable
1798 1799
1799# we have a set of functions if we're in managed mode, or 1800# we have a set of functions if we're in managed mode, or
1800# a default "page not available" simple functions for interactive mode 1801# a default "page not available" simple functions for interactive mode
@@ -1804,7 +1805,6 @@ if toastermain.settings.MANAGED:
1804 from django.contrib.auth import authenticate, login 1805 from django.contrib.auth import authenticate, login
1805 from django.contrib.auth.decorators import login_required 1806 from django.contrib.auth.decorators import login_required
1806 1807
1807 from orm.models import Project, ProjectLayer, ProjectTarget, ProjectVariable
1808 from orm.models import Branch, LayerSource, ToasterSetting, Release, Machine, LayerVersionDependency 1808 from orm.models import Branch, LayerSource, ToasterSetting, Release, Machine, LayerVersionDependency
1809 from bldcontrol.models import BuildRequest 1809 from bldcontrol.models import BuildRequest
1810 1810