X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/eb77cf373a37d609fcf39626c36d2878d4a60e6c..dc3368dad09fa4acb4cc480845f0ff3edc126483:/apps/api/urls.py?ds=inline diff --git a/apps/api/urls.py b/apps/api/urls.py index b36cbe30..c5b0986d 100644 --- a/apps/api/urls.py +++ b/apps/api/urls.py @@ -7,7 +7,7 @@ from api.resources import * FORMAT = r"\.(?Pxml|json|yaml)" DOC = r'(?P[^/]+)' -REVISION = r'(?Platest|[0-9a-f]{40})' +# REVISION = r'(?Platest|[0-9a-f]{40})' def urlpath(*args, **kwargs): format = kwargs.get('format', True) @@ -18,10 +18,15 @@ urlpatterns = patterns('', # url(r'^hello\.(?P.+)$', hello_resource), # Toolbar - url(r'^toolbar/buttons$', toolbar_buttons, {'emitter_format': 'json'}), - - # Toolbar + url(r'^toolbar/buttons$', toolbar_buttons, {'emitter_format': 'json'}), url(r'^toolbar/scriptlets$', scriptlets, {'emitter_format': 'json'}), + + # Pull requests + url(r"^pull-requests$", pullrequest_collection, + {'emitter_format': 'json'} ), + + url(r"^pull-requests/(?P\d+)$", pullrequest_rsrc, + {'emitter_format': 'json'}, name="pullrequest_view" ), # Documents url(r'^documents$', library_resource, @@ -30,30 +35,38 @@ urlpatterns = patterns('', url(urlpath(r'documents'), library_resource, name="document_list_view_withformat"), - url(urlpath(r'documents', DOC), - document_resource, name="document_view_withformat"), + #url(urlpath(r'documents', DOC), + # document_resource, name="document_view_withformat"), url(urlpath(r'documents', DOC, format=False), document_resource, {'emitter_format': 'json'}, name="document_view"), - - url(urlpath(r'documents', DOC, 'text', REVISION, format=False), + + url(urlpath(r'documents', DOC, 'gallery', format=False), + document_gallery, {'emitter_format': 'json'}, + name="docgallery_view"), + + # XML + url(urlpath(r'documents', DOC, 'text', format=False), document_text_resource, {'emitter_format': 'rawxml'}, name="doctext_view"), - url(urlpath(r'documents', DOC, 'html', REVISION, format=False), - document_text_resource, {'emitter_format': 'rawhtml'}, + # HTML + url(urlpath(r'documents', DOC, 'html', format=False), + document_html_resource, {'emitter_format': 'rawhtml'}, name="dochtml_view"), - url(urlpath(r'documents', DOC, 'dc', REVISION), - document_dc_resource, - name="docdc_view_withformat"), + # DC + #url(urlpath(r'documents', DOC, 'dc'), + # document_dc_resource, + # name="docdc_view_withformat"), - url(urlpath(r'documents', DOC, 'dc', REVISION, format=False), + url(urlpath(r'documents', DOC, 'dc', format=False), document_dc_resource, {'emitter_format': 'json'}, name="docdc_view"), - url(urlpath(r'documents', DOC, 'revision'), + # MERGE + url(urlpath(r'documents', DOC, 'revision', format=False), document_merge, {'emitter_format': 'json'}, name="docmerge_view") # url(r'^documents/(?P[^/]+)/parts$',