Merge branch 'master' into lqc-trunk

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

diff --git a/apps/api/resources.py b/apps/api/resources.py
index 2d09787..fbdb89b 100644 (file)
--- a/apps/api/resources.py
+++ b/apps/api/resources.py
@@ -14,12 +14,16 @@ authdata = {'authentication': DjangoAuth()}
 #
 
 import api.handlers.library_handlers as dh
 #
 
 import api.handlers.library_handlers as dh

+from api.handlers.text_handler import DocumentTextHandler
+

 library_resource = Resource(dh.LibraryHandler, **authdata)
 document_resource = Resource(dh.DocumentHandler, **authdata)
 library_resource = Resource(dh.LibraryHandler, **authdata)
 document_resource = Resource(dh.DocumentHandler, **authdata)

-document_text_resource = Resource(dh.DocumentTextHandler, **authdata)
+document_text_resource = Resource(DocumentTextHandler, **authdata)

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

-document_dc_resource = Resource(dh.DocumentDublinCoreHandler, **authdata)
+# document_dc_resource = Resource(dh.DocumentDublinCoreHandler, **authdata)
+document_gallery = Resource(dh.DocumentGalleryHandler, **authdata)

 document_merge = Resource(dh.MergeHandler, **authdata)
 document_merge = Resource(dh.MergeHandler, **authdata)

+diff_resource = Resource(dh.DiffHandler, **authdata)

 
 import api.handlers.manage_handlers as mh
 
 
 import api.handlers.manage_handlers as mh
 


@@ -39,10 +43,13 @@ __all__ = [
     'library_resource',
     'document_resource',
     'document_text_resource',
     'library_resource',
     'document_resource',
     'document_text_resource',

-    'document_dc_resource',
+    'document_html_resource',
+#    'document_dc_resource',
+    'document_gallery',

     'document_merge',
     'toolbar_buttons',
     'scriptlets',
     'pullrequest_collection',
     'pullrequest_rsrc',
     'document_merge',
     'toolbar_buttons',
     'scriptlets',
     'pullrequest_collection',
     'pullrequest_rsrc',

+    'diff_resource',

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