X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/1d07e208b0897af64f71755c974762bc7cd19ca0..97a587e5e522f4f94b97eb6e54c7a0a13ec34963:/apps/api/urls.py?ds=sidebyside diff --git a/apps/api/urls.py b/apps/api/urls.py index deac319a..52b0ccc5 100644 --- a/apps/api/urls.py +++ b/apps/api/urls.py @@ -30,11 +30,11 @@ urlpatterns = patterns('', # Pull requests url(r"^pull-requests$", pullrequest_collection, - {'emitter_format': 'json'} ), + {'emitter_format': 'json'}, name="pullrequest_list" ), url(r"^pull-requests/(?P\d+)$", pullrequest_rsrc, - {'emitter_format': 'json'}, name="pullrequest_view" ), - + {'emitter_format': 'json'}, name="pullrequest_view" ), + # Documents url(r'^documents$', library_resource, {'emitter_format': 'json'}, name="document_list_view"), @@ -68,13 +68,17 @@ urlpatterns = patterns('', # document_dc_resource, # name="docdc_view_withformat"), - url(urlpath(r'documents', DOC, 'dc', format=False), - document_dc_resource, {'emitter_format': 'json'}, - name="docdc_view"), +# url(urlpath(r'documents', DOC, 'dc', format=False), +# document_dc_resource, {'emitter_format': 'json'}, +# name="docdc_view"), # MERGE url(urlpath(r'documents', DOC, 'revision', format=False), - document_merge, {'emitter_format': 'json'}, name="docmerge_view") + document_merge, {'emitter_format': 'json'}, name="docmerge_view"), + + url(r'documents/(?P[^/]+)/diff$', + diff_resource, {'emitter_format': 'raw'}, name="diff_resource"), + # url(r'^documents/(?P[^/]+)/parts$', # document_resource, {'emitter_format': 'json'},