Skip to content

Commit

Permalink
Merge 8584f71 into e1b969c
Browse files Browse the repository at this point in the history
  • Loading branch information
Martí Bosch committed Jan 5, 2017
2 parents e1b969c + 8584f71 commit 4623d8a
Show file tree
Hide file tree
Showing 6 changed files with 131 additions and 50 deletions.
26 changes: 20 additions & 6 deletions waliki/attachments/urls.py
View file
@@ -1,11 +1,25 @@
from django.conf.urls import patterns, url
import django
try:
from django.conf.urls import patterns, url # django 1.8, 1.9
except ImportError:
from django.conf.urls import url

from waliki.settings import WALIKI_SLUG_PATTERN
from waliki.attachments.views import attachments, delete_attachment, get_file

urlpatterns = patterns('waliki.attachments.views',
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/attachments$', 'attachments',
_pattern_list = [
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/attachments$', attachments,
name='waliki_attachments'),
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/attachments/(?P<attachment_id_or_filename>.*)/delete$',
'delete_attachment', name='waliki_delete_attachment'),
delete_attachment, name='waliki_delete_attachment'),
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/attachment/((?P<attachment_id>\d+)/)?(?P<filename>.*)$',
'get_file', name='waliki_attachment_file')
)
get_file, name='waliki_attachment_file')
]


if django.VERSION[:2] >= (1, 10):
urlpatterns = _pattern_list
else:
urlpatterns = patterns('waliki.attachments.views',
*_pattern_list
)
45 changes: 31 additions & 14 deletions waliki/git/urls.py
View file
@@ -1,24 +1,41 @@
from django.conf.urls import patterns, url
from waliki.settings import WALIKI_SLUG_PATTERN
from waliki.git.views import WhatchangedFeed
import django
try:
from django.conf.urls import patterns, url # django 1.8, 1.9
except ImportError:
from django.conf.urls import url

from waliki.settings import WALIKI_SLUG_PATTERN
from waliki.git.views import whatchanged, WhatchangedFeed, webhook_pull, history, version, diff

urlpatterns = patterns('waliki.git.views',

url(r'^_whatchanged/(?P<pag>\d+)$', 'whatchanged', name='waliki_whatchanged'), # noqa
url(r'^_whatchanged$', 'whatchanged', {'pag': '1'}, name='waliki_whatchanged'), # noqa
_pattern_list = [
url(r'^_whatchanged/(?P<pag>\d+)$', whatchanged, name='waliki_whatchanged'), # noqa
url(r'^_whatchanged$', whatchanged, {'pag': '1'}, name='waliki_whatchanged'), # noqa
url(r'^_whatchanged/rss$', WhatchangedFeed(), name='waliki_whatchanged_rss'),

url(r'^_hooks/pull/(?P<remote>[a-zA-Z0-9]+)$', 'webhook_pull', name='waliki_webhook_pull'),
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/history/(?P<pag>\d+)$', 'history', name='waliki_history'),
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/history/$', 'history', {'pag': '1'}, name='waliki_history'),
url(r'^_hooks/pull/(?P<remote>[a-zA-Z0-9]+)$',
webhook_pull, name='waliki_webhook_pull'),
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/history/(?P<pag>\d+)$',
history, name='waliki_history'),
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/history/$',
history, {'pag': '1'}, name='waliki_history'),

url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/version/(?P<version>[0-9a-f\^]{4,40})/raw$', 'version', {'raw': True},
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/version/(?P<version>[0-9a-f\^]{4,40})/raw$', version, {'raw': True},
name='waliki_version_raw'),
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/version/(?P<version>[0-9a-f\^]{4,40})$', 'version', name='waliki_version'),
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + \
')/version/(?P<version>[0-9a-f\^]{4,40})$', version, name='waliki_version'),

url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/diff/(?P<old>[0-9a-f\^]{4,40})\.\.(?P<new>[0-9a-f\^]{4,40})/raw$',
'diff', {'raw': True}, name='waliki_diff_raw'),
diff, {'raw': True}, name='waliki_diff_raw'),

url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + \
')/diff/(?P<old>[0-9a-f\^]{4,40})\.\.(?P<new>[0-9a-f\^]{4,40})$', diff, name='waliki_diff'),
]


url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/diff/(?P<old>[0-9a-f\^]{4,40})\.\.(?P<new>[0-9a-f\^]{4,40})$', 'diff', name='waliki_diff'),
)
if django.VERSION[:2] >= (1, 10):
urlpatterns = _pattern_list
else:
urlpatterns = patterns('waliki.git.views',
*_pattern_list
)
21 changes: 17 additions & 4 deletions waliki/pdf/urls.py
View file
@@ -1,7 +1,20 @@
from django.conf.urls import patterns, url
import django
try:
from django.conf.urls import patterns, url # django 1.8, 1.9
except ImportError:
from django.conf.urls import url

from waliki.settings import WALIKI_SLUG_PATTERN
from waliki.pdf.views import pdf

_pattern_list = [
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/pdf$',
pdf, name='waliki_pdf'),
]

urlpatterns = patterns('waliki.pdf.views',
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/pdf$', 'pdf', name='waliki_pdf'),
)
if django.VERSION[:2] >= (1, 10):
urlpatterns = _pattern_list
else:
urlpatterns = patterns('waliki.pdf.views',
*_pattern_list
)
25 changes: 17 additions & 8 deletions waliki/search/urls.py
View file
Expand Up @@ -2,15 +2,24 @@

from __future__ import absolute_import, division, print_function, unicode_literals

from haystack.forms import SearchForm
import django
try:
from django.conf.urls import patterns, url # django 1.8, 1.9
except ImportError:
from django.conf.urls import url

from haystack.forms import SearchForm
from waliki.search.views import WalikiSearchView

try:
from django.conf.urls import patterns, url
except ImportError:
from django.conf.urls.defaults import patterns, url

urlpatterns = patterns('haystack.views',
url(r'^search$', WalikiSearchView(form_class=SearchForm), name='haystack_search'),
)
_pattern_list = [
url(r'^search$', WalikiSearchView(
form_class=SearchForm), name='haystack_search'),
]

if django.VERSION[:2] >= (1, 10):
urlpatterns = _pattern_list
else:
urlpatterns = patterns('haystack.views',
*_pattern_list
)
24 changes: 20 additions & 4 deletions waliki/slides/urls.py
View file
@@ -1,7 +1,23 @@
from django.conf.urls import patterns, url
import django
try:
from django.conf.urls import patterns, url # django 1.8, 1.9
except ImportError:
from django.conf.urls import url

from waliki.settings import WALIKI_SLUG_PATTERN
from waliki.slides.views import slides


_pattern_list = [
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/slides$',
slides, name='waliki_slides'),

]


urlpatterns = patterns('waliki.slides.views',
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/slides$', 'slides', name='waliki_slides'),
)
if django.VERSION[:2] >= (1, 10):
urlpatterns = _pattern_list
else:
urlpatterns = patterns('waliki.slides.views',
*_pattern_list
)
40 changes: 26 additions & 14 deletions waliki/urls.py
View file
@@ -1,30 +1,42 @@
from django.conf.urls import patterns, url, include
import django
try:
from django.conf.urls import patterns, url, include # django 1.8, 1.9
except ImportError:
from django.conf.urls import url, include
from django.contrib import admin

from waliki.settings import WALIKI_SLUG_PATTERN
from .plugins import load_plugins, page_urls
from .views import home, new, get_slug, preview, edit, delete, move, detail

admin.autodiscover()
load_plugins()


def waliki_urls():
base = [url(r'^$', 'home', name='waliki_home'),
url(r'^_new$', 'new', name='waliki_new'),
url(r'^_get_slug$', 'get_slug', name='waliki_get_slug'),
url(r'^_preview$', 'preview', name='waliki_preview')]
base = [url(r'^$', home, name='waliki_home'),
url(r'^_new$', new, name='waliki_new'),
url(r'^_get_slug$', get_slug, name='waliki_get_slug'),
url(r'^_preview$', preview, name='waliki_preview')]

for pattern in page_urls():
base.append(url(r'^', include(pattern)))

base += [url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/edit$', 'edit', name='waliki_edit'),
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/delete$', 'delete', name='waliki_delete'),
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/move$', 'move', name='waliki_move'),
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/raw$', 'detail', {'raw': True}, name='waliki_detail_raw'),
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')$', 'detail', name='waliki_detail'),
base += [url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/edit$', edit, name='waliki_edit'),
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/delete$',
delete, name='waliki_delete'),
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/move$',
move, name='waliki_move'),
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')/raw$',
detail, {'raw': True}, name='waliki_detail_raw'),
url(r'^(?P<slug>' + WALIKI_SLUG_PATTERN + ')$',
detail, name='waliki_detail'),
]
return base


urlpatterns = patterns('waliki.views',
*waliki_urls()
)
if django.VERSION[:2] >= (1, 10):
urlpatterns = waliki_urls()
else:
urlpatterns = patterns('waliki.views',
*waliki_urls()
)

0 comments on commit 4623d8a

Please sign in to comment.