ded/record
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'SketchControls'

Browse Source
This commit is contained in:
Anastasia
2015-07-16 10:07:35 +05:00
parent 239d19f23b 7670a71887
commit 4e0fc324e0
5 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
record/urls.py
View File

@@ -20,7 +20,7 @@ urlpatterns = patterns('',
url(r'^desreport/$', 'asuzr.views.desreport'),
url(r'^production_table/(?P<order_id>\d+)/$', 'asuzr.views.production_table'),
url(r'^sketches/(?P<order_id>\d+)/$', 'asuzr.views.sketches'),
url(r'^sketches/delete/$', 'asuzr.views.delete_sketch'),
url(r'^sketches/delete/$', 'asuzr.views.delete_sketch', name = 'asuzr-del-sketch'),
url(r'^prodplan/$', 'asuzr.views.prod_plan_view'),
url(r'^admin/', include(admin.site.urls)),
url(r'^log/$', 'asuzr.views.log_view'),
@@ -34,4 +34,5 @@ if settings.DEBUG:
# static files (images, css, javascript, etc.)
urlpatterns += patterns('',
(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
'document_root': settings.MEDIA_ROOT}))
'document_root': settings.MEDIA_ROOT}))