summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/toaster/bldcontrol/admin.py8
-rw-r--r--bitbake/lib/toaster/orm/admin.py17
-rw-r--r--bitbake/lib/toaster/toastermain/settings.py10
-rw-r--r--bitbake/lib/toaster/toastermain/urls.py18
4 files changed, 43 insertions, 10 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/admin.py b/bitbake/lib/toaster/bldcontrol/admin.py
new file mode 100644
index 0000000000..fcbe5f5935
--- /dev/null
+++ b/bitbake/lib/toaster/bldcontrol/admin.py
@@ -0,0 +1,8 @@
1from django.contrib import admin
2from django.contrib.admin.filters import RelatedFieldListFilter
3from .models import BuildEnvironment
4
5class BuildEnvironmentAdmin(admin.ModelAdmin):
6 pass
7
8admin.site.register(BuildEnvironment, BuildEnvironmentAdmin)
diff --git a/bitbake/lib/toaster/orm/admin.py b/bitbake/lib/toaster/orm/admin.py
new file mode 100644
index 0000000000..9383630486
--- /dev/null
+++ b/bitbake/lib/toaster/orm/admin.py
@@ -0,0 +1,17 @@
1from django.contrib import admin
2from django.contrib.admin.filters import RelatedFieldListFilter
3from .models import Branch, LayerSource, ToasterSetting
4
5class LayerSourceAdmin(admin.ModelAdmin):
6 pass
7
8class BranchAdmin(admin.ModelAdmin):
9 pass
10
11class ToasterSettingAdmin(admin.ModelAdmin):
12 pass
13
14admin.site.register(LayerSource, LayerSourceAdmin)
15admin.site.register(Branch, BranchAdmin)
16admin.site.register(ToasterSetting, ToasterSettingAdmin)
17
diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py
index 1dab25aa6b..42581f2df4 100644
--- a/bitbake/lib/toaster/toastermain/settings.py
+++ b/bitbake/lib/toaster/toastermain/settings.py
@@ -232,17 +232,13 @@ TEMPLATE_CONTEXT_PROCESSORS = ('django.contrib.auth.context_processors.auth',
232 232
233INSTALLED_APPS = ( 233INSTALLED_APPS = (
234 #'django.contrib.sites', 234 #'django.contrib.sites',
235 #'django.contrib.messages',
236 'django.contrib.staticfiles', 235 'django.contrib.staticfiles',
237 # Uncomment the next line to enable the admin:
238 # 'django.contrib.admin',
239 # Uncomment the next line to enable admin documentation: 236 # Uncomment the next line to enable admin documentation:
240 # 'django.contrib.admindocs', 237 # 'django.contrib.admindocs',
241 'django.contrib.humanize', 238 'django.contrib.humanize',
242 'orm', 239 'orm',
243 'toastermain', 240 'toastermain',
244 'south', 241 'south',
245 'bldcontrol',
246) 242)
247 243
248SOUTH_TESTS_MIGRATE = False 244SOUTH_TESTS_MIGRATE = False
@@ -251,7 +247,11 @@ SOUTH_TESTS_MIGRATE = False
251if MANAGED: 247if MANAGED:
252 INSTALLED_APPS = ('django.contrib.auth', 248 INSTALLED_APPS = ('django.contrib.auth',
253 'django.contrib.contenttypes', 249 'django.contrib.contenttypes',
254 'django.contrib.sessions',) + INSTALLED_APPS 250 'django.contrib.messages',
251 'django.contrib.sessions',
252 # Uncomment the next line to enable the admin:
253 'django.contrib.admin',
254 ) + INSTALLED_APPS
255 255
256 256
257# We automatically detect and install applications here if 257# We automatically detect and install applications here if
diff --git a/bitbake/lib/toaster/toastermain/urls.py b/bitbake/lib/toaster/toastermain/urls.py
index 0e7b5c2d77..1ae6245cc3 100644
--- a/bitbake/lib/toaster/toastermain/urls.py
+++ b/bitbake/lib/toaster/toastermain/urls.py
@@ -25,11 +25,12 @@ from django.views.decorators.cache import never_cache
25 25
26 26
27# Uncomment the next two lines to enable the admin: 27# Uncomment the next two lines to enable the admin:
28# from django.contrib import admin 28from django.contrib import admin
29# admin.autodiscover() 29admin.autodiscover()
30
30urlpatterns = patterns('', 31urlpatterns = patterns('',
32 # the api-s are not auto-discoverable
31 url(r'^api/1.0/', include('bldviewer.api')), 33 url(r'^api/1.0/', include('bldviewer.api')),
32 url(r'^$', never_cache(RedirectView.as_view(url='/toastergui/'))),
33 34
34 # Examples: 35 # Examples:
35 # url(r'^toaster/', include('toaster.foo.urls')), 36 # url(r'^toaster/', include('toaster.foo.urls')),
@@ -37,10 +38,17 @@ urlpatterns = patterns('',
37 # Uncomment the admin/doc line below to enable admin documentation: 38 # Uncomment the admin/doc line below to enable admin documentation:
38 # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), 39 # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
39 40
40 # Uncomment the next line to enable the admin: 41
41 # url(r'^admin/', include(admin.site.urls)), 42 # if no application is selected, we have the magic toastergui app here
43 url(r'^$', never_cache(RedirectView.as_view(url='/toastergui/'))),
42) 44)
43 45
46import toastermain.settings
47if toastermain.settings.MANAGED:
48 urlpatterns = urlpatterns + [
49 # Uncomment the next line to enable the admin:
50 url(r'^admin/', include(admin.site.urls)),
51 ]
44# Automatically discover urls.py in various apps, beside our own 52# Automatically discover urls.py in various apps, beside our own
45# and map module directories to the patterns 53# and map module directories to the patterns
46 54