carom/carom-server
6
1
Fork 0
Code Issues Pull Requests Releases 2 Activity

move code to use generic views

Browse Source
This commit is contained in:
Robert Einsle
2017-04-27 08:04:44 +02:00
parent b04e642daa
commit dc09be5a43
4 changed files with 83 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
billard/urls.py
View File

@@ -1,16 +1,27 @@
from django.conf.urls import url, include
from django.contrib.auth.decorators import login_required
from rest_framework import routers
from billard import views
router = routers.DefaultRouter()
router.register(r'location_data', views.LocationDataViewSet)
app_name = 'billard'
urlpatterns = [
url(r'^$', views.index, name='carom_index'),
url(r'^(?P<pk>[0-9]+)/$', views.LocationDataDetailView.as_view(), name='detail'),
url(r'api/v1/', include(router.urls)),
url(r'process_locationdata', views.process_locationdata, name='process_locationdata'),
url(r'accounting', views.accounting, name='accounting'),
url(r'accountmodal$', views.accountmodalview, name='accountmodal'),
url(r'accoutmodal/confirm/(?P<pk>[0-9]+)$', views.accountmodalconfirmview, name="accountmodalconfirm")
# ex. /billard/
url(r'^$', login_required(views.LocationListView.as_view()), name='location_list'),
# ex. /billard/1/
url(r'^(?P<pk>[0-9]+)/$', login_required(views.LocationDetailView.as_view()), name='location_detail'),
# ex. /billard/1/accounting/
#url(r'^(?P<pk>[0-9]+)/accounting/$', views.ResultsView.as_view(), name='accounting_detail'),
#url(r'^$', views.index, name='carom_index'),
#url(r'^(?P<pk>[0-9]+)/$', views.LocationDataDetailView.as_view(), name='detail'),
#url(r'api/v1/', include(router.urls)),
#url(r'process_locationdata', views.process_locationdata, name='process_locationdata'),
#url(r'^accounting/$', views.AccountingView.as_view(), name='accounting'),
#url(r'accountmodal$', views.accountmodalview, name='accountmodal'),
#url(r'accoutmodal/confirm/(?P<pk>[0-9]+)$', views.accountmodalconfirmview, name="accountmodalconfirm")
# (?P<pk>[0-9]+)
]