Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma into view-refactor

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

diff --git a/apps/api/urls.py b/apps/api/urls.py
index b36cbe3..6a95cf0 100644 (file)
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -18,10 +18,15 @@ urlpatterns = patterns('',
 #    url(r'^hello\.(?P<emitter_format>.+)$', hello_resource),
 
     # Toolbar
 #    url(r'^hello\.(?P<emitter_format>.+)$', 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'}),
     url(r'^toolbar/scriptlets$', scriptlets, {'emitter_format': 'json'}),

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

     
     # Documents
     url(r'^documents$', library_resource,
     
     # Documents
     url(r'^documents$', library_resource,


@@ -42,7 +47,7 @@ urlpatterns = patterns('',
         name="doctext_view"),
 
     url(urlpath(r'documents', DOC, 'html', REVISION, format=False),
         name="doctext_view"),
 
     url(urlpath(r'documents', DOC, 'html', REVISION, format=False),

-        document_text_resource, {'emitter_format': 'rawhtml'},
+        document_html_resource, {'emitter_format': 'rawhtml'},

         name="dochtml_view"),
 
     url(urlpath(r'documents', DOC, 'dc', REVISION),
         name="dochtml_view"),
 
     url(urlpath(r'documents', DOC, 'dc', REVISION),


@@ -53,7 +58,7 @@ urlpatterns = patterns('',
         document_dc_resource, {'emitter_format': 'json'},
         name="docdc_view"),
 
         document_dc_resource, {'emitter_format': 'json'},
         name="docdc_view"),
 

-    url(urlpath(r'documents', DOC, 'revision'),
+    url(urlpath(r'documents', DOC, 'revision', format=False),

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