Pierwsza implementacja DocumentModel.{merge|update}. Zmiana sposobu generowania URLi...

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

diff --git a/apps/api/resources.py b/apps/api/resources.py
index d45fa1d..51127e4 100644 (file)
--- a/apps/api/resources.py
+++ b/apps/api/resources.py
@@ -7,9 +7,6 @@ __doc__ = "Module documentation."
 from piston.resource import Resource
 from api.utils import DjangoAuth
 
 from piston.resource import Resource
 from api.utils import DjangoAuth
 

-
-
-

 authdata = {'authentication': DjangoAuth()}
 
 #
 authdata = {'authentication': DjangoAuth()}
 
 #


@@ -20,7 +17,14 @@ import api.handlers.library_handlers as dh
 library_resource = Resource(dh.LibraryHandler, **authdata)
 document_resource = Resource(dh.DocumentHandler, **authdata)
 document_text_resource = Resource(dh.DocumentTextHandler, **authdata)
 library_resource = Resource(dh.LibraryHandler, **authdata)
 document_resource = Resource(dh.DocumentHandler, **authdata)
 document_text_resource = Resource(dh.DocumentTextHandler, **authdata)

+document_html_resource = Resource(dh.DocumentHTMLHandler, **authdata)

 document_dc_resource = Resource(dh.DocumentDublinCoreHandler, **authdata)
 document_dc_resource = Resource(dh.DocumentDublinCoreHandler, **authdata)

+document_merge = Resource(dh.MergeHandler, **authdata)
+
+import api.handlers.manage_handlers as mh
+
+pullrequest_collection = Resource(mh.PullRequestListHandler, **authdata)
+pullrequest_rsrc = Resource(mh.PullRequestHandler, **authdata)

 
 #
 # Toolbar resources
 
 #
 # Toolbar resources


@@ -29,11 +33,17 @@ import api.handlers.toolbar_handlers as th
 toolbar_buttons = Resource(th.ToolbarHandler, **authdata)
 scriptlets = Resource(th.ScriptletsHandler, **authdata)
 
 toolbar_buttons = Resource(th.ToolbarHandler, **authdata)
 scriptlets = Resource(th.ScriptletsHandler, **authdata)
 

+
+

 __all__ = [
     'library_resource',
     'document_resource',
     'document_text_resource',
 __all__ = [
     'library_resource',
     'document_resource',
     'document_text_resource',

+    'document_html_resource',

     'document_dc_resource',
     'document_dc_resource',

+    'document_merge',

     'toolbar_buttons',
     'toolbar_buttons',

-    'scriptlets'
+    'scriptlets',
+    'pullrequest_collection',
+    'pullrequest_rsrc',

 ]
\ No newline at end of file
 ]
\ No newline at end of file