diff options
| author | Sebastian Reichel <sre@ring0.de> | 2015-05-10 01:06:46 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@ring0.de> | 2015-05-10 01:06:46 +0200 |
| commit | 1f448ff2a0df12afbac6c3a30a23829440495cd4 (patch) | |
| tree | dbf8e14db6ec25af07c3da1a5466531290af7b61 /inventar/urls.py | |
| parent | 1c3bd651e0477d133e5770930eb8c7bb08c4aff5 (diff) | |
| parent | 1dc5ee4fdeb29dc6e058bda5a7c259968b763860 (diff) | |
| download | ktt-inventory-system-1f448ff2a0df12afbac6c3a30a23829440495cd4.tar.bz2 | |
merge conflict
Diffstat (limited to 'inventar/urls.py')
| -rw-r--r-- | inventar/urls.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/inventar/urls.py b/inventar/urls.py index 7162524..370b283 100644 --- a/inventar/urls.py +++ b/inventar/urls.py @@ -24,16 +24,17 @@ from inventory.views import item from inventory.views import search from inventory.views import graph from inventory.views import stats +from inventory.views import upload urlpatterns = patterns('', url(r'^$', home, name='home'), - #(r'^openid/', include('django_openid_auth.urls')), url(r'^item/(?P<selectedid>[0-9A-Za-z]{4,6})/$', item, name='item'), url(r'^search/(?P<term>[^/]+)/$', search, name='search'), url(r'^graph/$', graph, name='graph'), url(r'^stats/$', stats, name='stats'), + url(r'^upload/$', upload, name='upload'), url(r'^admin/', include(admin.site.urls)), ) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) |