Django 1.0 support.

see #1024
This commit is contained in:
Antoine Nguyen
2017-02-10 14:29:21 +01:00
parent 27d364a046
commit 01f926ca95
18 changed files with 134 additions and 132 deletions
+49 -44
View File
@@ -1,71 +1,76 @@
"""Admin urls."""
from django.conf.urls import patterns, url
from django.conf.urls import url
from . import views
from .views import import_ as import_views
from .views import alias as alias_views
from .views import domain as domain_views
from .views import export as export_views
from .views import identity as identity_views
urlpatterns = patterns(
'modoboa.admin.views.domain',
url(r'^$', 'index', name="index"),
url(r'^domains/$', 'domains', name="domain_list"),
urlpatterns = [
url(r'^$', domain_views.index, name="index"),
url(r'^domains/$', domain_views.domains, name="domain_list"),
url(r'^domains/(?P<pk>\d+)/$', views.DomainDetailView.as_view(),
name="domain_detail"),
url(r'^domains/(?P<pk>\d+)/dnsbl/$', views.DNSBLDomainDetailView.as_view(),
name="dnsbl_domain_detail"),
url(r'^domains/(?P<pk>\d+)/mx/$', views.MXDomainDetailView.as_view(),
name="mx_domain_detail"),
url(r'^domains/list/$', '_domains', name="_domain_list"),
url(r'^domains/flatlist/$', 'domains_list', name="domain_flat_list"),
url(r'^domains/new/', 'newdomain', name='domain_add'),
url(r'^domains/(?P<dom_id>\d+)/edit/$', 'editdomain',
url(r'^domains/list/$', domain_views._domains, name="_domain_list"),
url(r'^domains/flatlist/$', domain_views.domains_list,
name="domain_flat_list"),
url(r'^domains/new/', domain_views.newdomain, name='domain_add'),
url(r'^domains/(?P<dom_id>\d+)/edit/$', domain_views.editdomain,
name="domain_change"),
url(r'^domains/(?P<dom_id>\d+)/delete/$', 'deldomain',
url(r'^domains/(?P<dom_id>\d+)/delete/$', domain_views.deldomain,
name="domain_delete"),
)
]
urlpatterns += patterns(
'modoboa.admin.views.identity',
url(r'^permissions/remove/$', 'remove_permission',
urlpatterns += [
url(r'^permissions/remove/$', identity_views.remove_permission,
name="permission_remove"),
url(r'^identities/$', 'identities', name="identity_list"),
url(r'^identities/list/$', '_identities', name="_identity_list"),
url(r'^identities/quotas/$', 'list_quotas', name="quota_list"),
url(r'^identities/page/$', 'get_next_page', name="identity_page"),
url(r'^identities/$', identity_views.identities, name="identity_list"),
url(r'^identities/list/$', identity_views._identities,
name="_identity_list"),
url(r'^identities/quotas/$', identity_views.list_quotas,
name="quota_list"),
url(r'^identities/page/$', identity_views.get_next_page,
name="identity_page"),
url(r'^accounts/list/$', 'accounts_list', name="account_list"),
url(r'^accounts/new/$', 'newaccount', name="account_add"),
url(r'^accounts/list/$', identity_views.accounts_list,
name="account_list"),
url(r'^accounts/new/$', identity_views.newaccount, name="account_add"),
url(r'^accounts/(?P<pk>\d+)/$', views.AccountDetailView.as_view(),
name="account_detail"),
url(r'^accounts/(?P<pk>\d+)/edit/$', 'editaccount',
url(r'^accounts/(?P<pk>\d+)/edit/$', identity_views.editaccount,
name="account_change"),
url(r'^accounts/(?P<pk>\d+)/delete/$', 'delaccount',
url(r'^accounts/(?P<pk>\d+)/delete/$', identity_views.delaccount,
name="account_delete"),
)
]
urlpatterns += patterns(
'modoboa.admin.views.alias',
url(r'^aliases/new/$', 'newalias', name="alias_add"),
urlpatterns += [
url(r'^aliases/new/$', alias_views.newalias, name="alias_add"),
url(r'^aliases/(?P<pk>\d+)/$', views.AliasDetailView.as_view(),
name="alias_detail"),
url(r'^aliases/(?P<alid>\d+)/edit/$', 'editalias', name="alias_change"),
url(r'^aliases/delete/$', 'delalias', name="alias_delete"),
)
url(r'^aliases/(?P<alid>\d+)/edit/$', alias_views.editalias,
name="alias_change"),
url(r'^aliases/delete/$', alias_views.delalias, name="alias_delete"),
]
urlpatterns += patterns(
'modoboa.admin.views.import_',
urlpatterns += [
url(r'^domains/import/$', import_views.import_domains,
name="domain_import"),
url(r'^identities/import/$', import_views.import_identities,
name="identity_import"),
]
url(r'^domains/import/$', 'import_domains', name="domain_import"),
url(r'^identities/import/$', 'import_identities', name="identity_import"),
)
urlpatterns += patterns(
'modoboa.admin.views.export',
url(r'^domains/export/$', 'export_domains', name="domain_export"),
url(r'^identities/export/$', 'export_identities', name="identity_export"),
)
urlpatterns += [
url(r'^domains/export/$', export_views.export_domains,
name="domain_export"),
url(r'^identities/export/$', export_views.export_identities,
name="identity_export"),
]