aboutsummaryrefslogtreecommitdiffstats
path: root/motor
diff options
context:
space:
mode:
Diffstat (limited to 'motor')
-rw-r--r--motor/settings.py2
-rw-r--r--motor/urls.py13
2 files changed, 11 insertions, 4 deletions
diff --git a/motor/settings.py b/motor/settings.py
index 612efee..c752b59 100644
--- a/motor/settings.py
+++ b/motor/settings.py
@@ -127,7 +127,7 @@ INSTALLED_APPS = (
'django.contrib.messages',
'django.contrib.staticfiles',
# Uncomment the next line to enable the admin:
- #'django.contrib.admin',
+ 'django.contrib.admin',
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
'bootstrap3',
diff --git a/motor/urls.py b/motor/urls.py
index 9ec4845..394a7fd 100644
--- a/motor/urls.py
+++ b/motor/urls.py
@@ -3,11 +3,18 @@ from django.views.generic import TemplateView
from apps.core.views import *
from apps.issues.views import *
+from django.contrib import admin
+admin.autodiscover()
+
urlpatterns = patterns(
'',
#url(r'^$', 'docs.views.index', name='docs-index'),
- url(r'^$', list_issues, name='issues-index'),
- url(r'^(\d+)/$', list_issues, name='issues-index'),
+ url(r'^$', welcome, name='issues-welcome'),
+ url(r'^issues/(\d+)/$', list_issues, name='issues-index'),
+ url(r'^issues/device/$', choose_device, name='issues-choose_device'),
+ url(r'^issues/device/([A-Z]+)/$', choose_device, name='issues-choose_device'),
+ url(r'^issues/warranty/$', warranty, name='issues-warranty'),
+ url(r'^issues/customer/$', customer, name='issues-customer'),
url(r'^manage/$', LoginView.as_view(), name='core-login'),
url(r'^manage/logout/$', logout, name='core-logout'),
url(r'^manage/docs/$', ArticleListView.as_view(), name='core-list_docs'),
@@ -23,6 +30,6 @@ urlpatterns = patterns(
url(r'^manage/issues/add/$', IssueCreateView.as_view(), name='issues-add_issue'),
url(r'^manage/issues/(?P<pk>\d+)/$', IssueEditView.as_view(), name='issues-edit_issue'),
url(r'^terms/$', TemplateView.as_view(template_name="terms.html"), {'title': 'ServoApp Terms of Service'}),
- #(r'^admin/', include(admin.site.urls)),
+ (r'^admin/', include(admin.site.urls)),
#url(r'^([\w\-]+)/$', 'docs.views.view_article', name='docs-view'),
)