fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma
[redakcja.git]
/
apps
/
api
/
urls.py
diff --git
a/apps/api/urls.py
b/apps/api/urls.py
index
c5b0986
..
0ed6459
100644
(file)
--- a/
apps/api/urls.py
+++ b/
apps/api/urls.py
@@
-2,7
+2,6
@@
__author__="lreqc"
__date__ ="$2009-09-17 16:16:54$"
from django.conf.urls.defaults import *
__date__ ="$2009-09-17 16:16:54$"
from django.conf.urls.defaults import *
-
from api.resources import *
FORMAT = r"\.(?P<emitter_format>xml|json|yaml)"
from api.resources import *
FORMAT = r"\.(?P<emitter_format>xml|json|yaml)"
@@
-17,17
+16,25
@@
urlpatterns = patterns('',
# url(r'^hello$', hello_resource, {'emitter_format': 'json'}),
# url(r'^hello\.(?P<emitter_format>.+)$', hello_resource),
# url(r'^hello$', hello_resource, {'emitter_format': 'json'}),
# url(r'^hello\.(?P<emitter_format>.+)$', hello_resource),
+ # HTML Renderer service
+ url(r'^render$', 'api.views.render'),
+
# Toolbar
# Toolbar
- url(r'^toolbar/buttons$', toolbar_buttons, {'emitter_format': 'json'}),
- url(r'^toolbar/scriptlets$', scriptlets, {'emitter_format': 'json'}),
+ url(r'^toolbar/buttons$', toolbar_buttons, {'emitter_format': 'json'},
+ name="toolbar_buttons"
+ ),
+
+ url(r'^toolbar/scriptlets$', scriptlets, {'emitter_format': 'json'},
+ name="toolbar_scriptlets"
+ ),
# 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,
url(r"^pull-requests/(?P<prq_id>\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"),
# Documents
url(r'^documents$', library_resource,
{'emitter_format': 'json'}, name="document_list_view"),
@@
-48,12
+55,12
@@
urlpatterns = patterns('',
# XML
url(urlpath(r'documents', DOC, 'text', format=False),
# XML
url(urlpath(r'documents', DOC, 'text', format=False),
- document_text_resource, {'emitter_format': 'raw
xml
'},
+ document_text_resource, {'emitter_format': 'raw'},
name="doctext_view"),
# HTML
url(urlpath(r'documents', DOC, 'html', format=False),
name="doctext_view"),
# HTML
url(urlpath(r'documents', DOC, 'html', format=False),
- document_html_resource, {'emitter_format': 'raw
html
'},
+ document_html_resource, {'emitter_format': 'raw'},
name="dochtml_view"),
# DC
name="dochtml_view"),
# DC
@@
-61,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'diffs/(?P<source_revision>latest|[0-9a-fA-F]+)/(?P<target_revision>latest|[0-9a-fA-F]+)/$',
+ 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'},