diff options
-rw-r--r-- | bitbake/lib/toaster/bldcollector/__init__.py | 0 | ||||
-rw-r--r-- | bitbake/lib/toaster/bldcollector/admin.py (renamed from bitbake/lib/toaster/orm/admin.py) | 3 | ||||
-rw-r--r-- | bitbake/lib/toaster/bldcollector/urls.py (renamed from bitbake/lib/toaster/orm/urls.py) | 3 | ||||
-rw-r--r-- | bitbake/lib/toaster/bldcollector/views.py (renamed from bitbake/lib/toaster/orm/views.py) | 0 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastermain/settings.py | 2 |
5 files changed, 3 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/bldcollector/__init__.py b/bitbake/lib/toaster/bldcollector/__init__.py new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/bitbake/lib/toaster/bldcollector/__init__.py | |||
diff --git a/bitbake/lib/toaster/orm/admin.py b/bitbake/lib/toaster/bldcollector/admin.py index 706e517e0e..c1f85d73d5 100644 --- a/bitbake/lib/toaster/orm/admin.py +++ b/bitbake/lib/toaster/bldcollector/admin.py | |||
@@ -1,6 +1,6 @@ | |||
1 | from django.contrib import admin | 1 | from django.contrib import admin |
2 | from django.contrib.admin.filters import RelatedFieldListFilter | 2 | from django.contrib.admin.filters import RelatedFieldListFilter |
3 | from .models import BitbakeVersion, Release, LayerSource, ToasterSetting | 3 | from orm.models import BitbakeVersion, Release, LayerSource, ToasterSetting |
4 | from django.forms.widgets import Textarea | 4 | from django.forms.widgets import Textarea |
5 | from django import forms | 5 | from django import forms |
6 | import django.db.models as models | 6 | import django.db.models as models |
@@ -31,4 +31,3 @@ admin.site.register(LayerSource, LayerSourceAdmin) | |||
31 | admin.site.register(BitbakeVersion, BitbakeVersionAdmin) | 31 | admin.site.register(BitbakeVersion, BitbakeVersionAdmin) |
32 | admin.site.register(Release, ReleaseAdmin) | 32 | admin.site.register(Release, ReleaseAdmin) |
33 | admin.site.register(ToasterSetting, ToasterSettingAdmin) | 33 | admin.site.register(ToasterSetting, ToasterSettingAdmin) |
34 | |||
diff --git a/bitbake/lib/toaster/orm/urls.py b/bitbake/lib/toaster/bldcollector/urls.py index 961bc19070..144387b56a 100644 --- a/bitbake/lib/toaster/orm/urls.py +++ b/bitbake/lib/toaster/bldcollector/urls.py | |||
@@ -20,8 +20,7 @@ | |||
20 | from django.conf.urls import patterns, include, url | 20 | from django.conf.urls import patterns, include, url |
21 | from django.views.generic import RedirectView | 21 | from django.views.generic import RedirectView |
22 | 22 | ||
23 | urlpatterns = patterns('orm.views', | 23 | urlpatterns = patterns('bldcollector.views', |
24 | # landing point for pushing a bitbake_eventlog.json file to this toaster instace | 24 | # landing point for pushing a bitbake_eventlog.json file to this toaster instace |
25 | url(r'^eventfile$', 'eventfile', name='eventfile'), | 25 | url(r'^eventfile$', 'eventfile', name='eventfile'), |
26 | ) | 26 | ) |
27 | |||
diff --git a/bitbake/lib/toaster/orm/views.py b/bitbake/lib/toaster/bldcollector/views.py index f32fa4d225..f32fa4d225 100644 --- a/bitbake/lib/toaster/orm/views.py +++ b/bitbake/lib/toaster/bldcollector/views.py | |||
diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py index 60e80de2f6..c72a90411b 100644 --- a/bitbake/lib/toaster/toastermain/settings.py +++ b/bitbake/lib/toaster/toastermain/settings.py | |||
@@ -268,7 +268,7 @@ INSTALLED_APPS = ( | |||
268 | # Uncomment the next line to enable admin documentation: | 268 | # Uncomment the next line to enable admin documentation: |
269 | # 'django.contrib.admindocs', | 269 | # 'django.contrib.admindocs', |
270 | 'django.contrib.humanize', | 270 | 'django.contrib.humanize', |
271 | 'orm', | 271 | 'bldcollector', |
272 | 'toastermain', | 272 | 'toastermain', |
273 | 'south', | 273 | 'south', |
274 | ) | 274 | ) |