diff --git a/mayan/urls.py b/mayan/urls.py index 982073893e..ca547e6c59 100644 --- a/mayan/urls.py +++ b/mayan/urls.py @@ -5,42 +5,39 @@ from django.contrib import admin admin.autodiscover() urlpatterns = patterns('', - (r'^admin/doc/', include('django.contrib.admindocs.urls')), - (r'^admin/', include(admin.site.urls)), - - (r'^', include('common.urls', namespace='common')), - (r'^', include('main.urls', namespace='main')), + url(r'^', include('common.urls', namespace='common')), + url(r'^', include('main.urls', namespace='main')), + url(r'^acls/', include('acls.urls', namespace='acls')), + url(r'^admin/', include(admin.site.urls)), + url(r'^api/', include('rest_api.urls')), + url(r'^bootstrap/', include('bootstrap.urls', namespace='bootstrap')), + url(r'^checkouts/', include('checkouts.urls', namespace='checkout')), + url(r'^comments/', include('document_comments.urls', namespace='comments')), + url(r'^document_acls/', include('document_acls.urls', namespace='document_acls')), + url(r'^document_indexing/', include('document_indexing.urls', namespace='indexing')), + url(r'^documents/', include('documents.urls', namespace='documents')), + url(r'^documents/signatures/', include('document_signatures.urls', namespace='signatures')), url(r'^docs/', include('rest_framework_swagger.urls')), - (r'^documents/', include('documents.urls', namespace='documents')), - (r'^folders/', include('folders.urls', namespace='folders')), - (r'^search/', include('dynamic_search.urls', namespace='search')), - (r'^ocr/', include('ocr.urls', namespace='ocr')), - (r'^permissions/', include('permissions.urls', namespace='permissions')), - (r'^tags/', include('tags.urls', namespace='tags')), - (r'^comments/', include('document_comments.urls', namespace='comments')), - (r'^user_management/', include('user_management.urls', namespace='user_management')), - (r'^settings/', include('smart_settings.urls', namespace='settings')), - (r'^metadata/', include('metadata.urls', namespace='metadata')), - (r'^linking/', include('linking.urls', namespace='linking')), - (r'^document_indexing/', include('document_indexing.urls', namespace='indexing')), - (r'^history/', include('history.urls', namespace='history')), - (r'^sources/', include('sources.urls', namespace='sources')), - (r'^project_setup/', include('project_setup.urls', namespace='project_setup')), - (r'^project_tools/', include('project_tools.urls', namespace='project_tools')), - (r'^acls/', include('acls.urls', namespace='acls')), - (r'^document_acls/', include('document_acls.urls', namespace='document_acls')), - (r'^api/', include('rest_api.urls')), - (r'^gpg/', include('django_gpg.urls', namespace='django_gpg')), - (r'^documents/signatures/', include('document_signatures.urls', namespace='signatures')), - (r'^checkouts/', include('checkouts.urls', namespace='checkout')), - (r'^installation/', include('installation.urls', namespace='installation')), - (r'^bootstrap/', include('bootstrap.urls', namespace='bootstrap')), - (r'^registration/', include('registration.urls', namespace='registration')), - (r'^statistics/', include('statistics.urls', namespace='statistics')), - (r'^mailer/', include('mailer.urls', namespace='mailer')), + url(r'^folders/', include('folders.urls', namespace='folders')), + url(r'^gpg/', include('django_gpg.urls', namespace='django_gpg')), + url(r'^history/', include('history.urls', namespace='history')), + url(r'^installation/', include('installation.urls', namespace='installation')), + url(r'^linking/', include('linking.urls', namespace='linking')), + url(r'^mailer/', include('mailer.urls', namespace='mailer')), + url(r'^metadata/', include('metadata.urls', namespace='metadata')), + url(r'^ocr/', include('ocr.urls', namespace='ocr')), + url(r'^permissions/', include('permissions.urls', namespace='permissions')), + url(r'^project_setup/', include('project_setup.urls', namespace='project_setup')), + url(r'^project_tools/', include('project_tools.urls', namespace='project_tools')), + url(r'^registration/', include('registration.urls', namespace='registration')), + url(r'^search/', include('dynamic_search.urls', namespace='search')), + url(r'^settings/', include('smart_settings.urls', namespace='settings')), + url(r'^sources/', include('sources.urls', namespace='sources')), + url(r'^statistics/', include('statistics.urls', namespace='statistics')), + url(r'^tags/', include('tags.urls', namespace='tags')), + url(r'^user_management/', include('user_management.urls', namespace='user_management')), ) - def handler500(request): """ 500 error handler which includes ``request`` in the context.