CodeMirror i splitter w widoku edycji.

[redakcja.git] / apps / api / urls.py

diff --git a/apps/api/urls.py b/apps/api/urls.py
index d22d595..52b0ccc 100644 (file)
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -30,7 +30,7 @@ urlpatterns = patterns('',
 
     # Pull requests
     url(r"^pull-requests$", pullrequest_collection,
 
     # Pull requests
     url(r"^pull-requests$", pullrequest_collection,

-        {'emitter_format': 'json'} ),
+        {'emitter_format': 'json'}, name="pullrequest_list" ),

         
     url(r"^pull-requests/(?P<prq_id>\d+)$", pullrequest_rsrc,
         {'emitter_format': 'json'}, name="pullrequest_view" ),
         
     url(r"^pull-requests/(?P<prq_id>\d+)$", pullrequest_rsrc,
         {'emitter_format': 'json'}, name="pullrequest_view" ),


@@ -68,13 +68,17 @@ urlpatterns = patterns('',
     #    document_dc_resource,
     #    name="docdc_view_withformat"),
 
     #    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),
 
     # 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<docid>[^/]+)/diff$',
+        diff_resource, {'emitter_format': 'raw'}, name="diff_resource"),
+    

 
 #    url(r'^documents/(?P<docid>[^/]+)/parts$',
 #        document_resource, {'emitter_format': 'json'},
 
 #    url(r'^documents/(?P<docid>[^/]+)/parts$',
 #        document_resource, {'emitter_format': 'json'},