diff options
Diffstat (limited to 'bitbake/lib/toaster/toastermain/urls.py')
-rw-r--r-- | bitbake/lib/toaster/toastermain/urls.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/toastermain/urls.py b/bitbake/lib/toaster/toastermain/urls.py index 549fda12d6..a2916e2dd7 100644 --- a/bitbake/lib/toaster/toastermain/urls.py +++ b/bitbake/lib/toaster/toastermain/urls.py | |||
@@ -44,11 +44,15 @@ urlpatterns = patterns('', | |||
44 | ) | 44 | ) |
45 | 45 | ||
46 | import toastermain.settings | 46 | import toastermain.settings |
47 | |||
48 | if toastermain.settings.FRESH_ENABLED: | ||
49 | urlpatterns.insert(1, url(r'', include('fresh.urls'))) | ||
50 | |||
47 | if toastermain.settings.MANAGED: | 51 | if toastermain.settings.MANAGED: |
48 | urlpatterns = urlpatterns + [ | 52 | urlpatterns = [ |
49 | # Uncomment the next line to enable the admin: | 53 | # Uncomment the next line to enable the admin: |
50 | url(r'^admin/', include(admin.site.urls)), | 54 | url(r'^admin/', include(admin.site.urls)), |
51 | ] | 55 | ] + urlpatterns |
52 | # Automatically discover urls.py in various apps, beside our own | 56 | # Automatically discover urls.py in various apps, beside our own |
53 | # and map module directories to the patterns | 57 | # and map module directories to the patterns |
54 | 58 | ||
@@ -61,4 +65,4 @@ for t in os.walk(os.path.dirname(currentdir)): | |||
61 | 65 | ||
62 | if "urls.py" in t[2] and t[0] != currentdir: | 66 | if "urls.py" in t[2] and t[0] != currentdir: |
63 | modulename = os.path.basename(t[0]) | 67 | modulename = os.path.basename(t[0]) |
64 | urlpatterns.append( url(r'^' + modulename + '/', include ( modulename + '.urls'))) | 68 | urlpatterns.insert(0, url(r'^' + modulename + '/', include ( modulename + '.urls'))) |