Drop deprecated url patterns format
This commit is contained in:
Patrick Altman
parent
1ab7a30435
commit
7b77b9aa29
7 changed files with 150 additions and 101 deletions
|
|
@ -1,7 +1,7 @@
|
|||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .views import user_list
|
||||
|
||||
urlpatterns = patterns(
|
||||
"symposion.conference.views",
|
||||
url(r"^users/$", "user_list", name="user_list"),
|
||||
)
|
||||
urlpatterns = [
|
||||
url(r"^users/$", user_list, name="user_list"),
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,21 +1,32 @@
|
|||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
|
||||
urlpatterns = patterns(
|
||||
"symposion.proposals.views",
|
||||
url(r"^submit/$", "proposal_submit", name="proposal_submit"),
|
||||
url(r"^submit/([\w\-]+)/$", "proposal_submit_kind",
|
||||
name="proposal_submit_kind"),
|
||||
url(r"^(\d+)/$", "proposal_detail", name="proposal_detail"),
|
||||
url(r"^(\d+)/edit/$", "proposal_edit", name="proposal_edit"),
|
||||
url(r"^(\d+)/speakers/$", "proposal_speaker_manage",
|
||||
name="proposal_speaker_manage"),
|
||||
url(r"^(\d+)/cancel/$", "proposal_cancel", name="proposal_cancel"),
|
||||
url(r"^(\d+)/leave/$", "proposal_leave", name="proposal_leave"),
|
||||
url(r"^(\d+)/join/$", "proposal_pending_join", name="proposal_pending_join"),
|
||||
url(r"^(\d+)/decline/$", "proposal_pending_decline", name="proposal_pending_decline"),
|
||||
|
||||
url(r"^(\d+)/document/create/$", "document_create", name="proposal_document_create"),
|
||||
url(r"^document/(\d+)/delete/$", "document_delete", name="proposal_document_delete"),
|
||||
url(r"^document/(\d+)/([^/]+)$", "document_download", name="proposal_document_download"),
|
||||
from .views import (
|
||||
proposal_submit,
|
||||
proposal_submit_kind,
|
||||
proposal_detail,
|
||||
proposal_edit,
|
||||
proposal_speaker_manage,
|
||||
proposal_cancel,
|
||||
proposal_leave,
|
||||
proposal_pending_join,
|
||||
proposal_pending_decline,
|
||||
document_create,
|
||||
document_delete,
|
||||
document_download,
|
||||
)
|
||||
|
||||
urlpatterns = [
|
||||
url(r"^submit/$", proposal_submit, name="proposal_submit"),
|
||||
url(r"^submit/([\w\-]+)/$", proposal_submit_kind, name="proposal_submit_kind"),
|
||||
url(r"^(\d+)/$", proposal_detail, name="proposal_detail"),
|
||||
url(r"^(\d+)/edit/$", proposal_edit, name="proposal_edit"),
|
||||
url(r"^(\d+)/speakers/$", proposal_speaker_manage, name="proposal_speaker_manage"),
|
||||
url(r"^(\d+)/cancel/$", proposal_cancel, name="proposal_cancel"),
|
||||
url(r"^(\d+)/leave/$", proposal_leave, name="proposal_leave"),
|
||||
url(r"^(\d+)/join/$", proposal_pending_join, name="proposal_pending_join"),
|
||||
url(r"^(\d+)/decline/$", proposal_pending_decline, name="proposal_pending_decline"),
|
||||
|
||||
url(r"^(\d+)/document/create/$", document_create, name="proposal_document_create"),
|
||||
url(r"^document/(\d+)/delete/$", document_delete, name="proposal_document_delete"),
|
||||
url(r"^document/(\d+)/([^/]+)$", document_download, name="proposal_document_download"),
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,25 +1,37 @@
|
|||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
|
||||
urlpatterns = patterns(
|
||||
"symposion.reviews.views",
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/all/$", "review_section", {"reviewed": "all"}, name="review_section"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/reviewed/$", "review_section", {"reviewed": "reviewed"}, name="user_reviewed"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/not_reviewed/$", "review_section", {"reviewed": "not_reviewed"}, name="user_not_reviewed"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/assignments/$", "review_section", {"assigned": True}, name="review_section_assignments"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/status/$", "review_status", name="review_status"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/status/(?P<key>\w+)/$", "review_status", name="review_status"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/list/(?P<user_pk>\d+)/$", "review_list", name="review_list_user"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/admin/$", "review_admin", name="review_admin"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/admin/accept/$", "review_bulk_accept", name="review_bulk_accept"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/notification/(?P<status>\w+)/$", "result_notification", name="result_notification"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/notification/(?P<status>\w+)/prepare/$", "result_notification_prepare", name="result_notification_prepare"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/notification/(?P<status>\w+)/send/$", "result_notification_send", name="result_notification_send"),
|
||||
|
||||
url(r"^review/(?P<pk>\d+)/$", "review_detail", name="review_detail"),
|
||||
|
||||
url(r"^(?P<pk>\d+)/delete/$", "review_delete", name="review_delete"),
|
||||
url(r"^assignments/$", "review_assignments", name="review_assignments"),
|
||||
url(r"^assignment/(?P<pk>\d+)/opt-out/$", "review_assignment_opt_out",
|
||||
name="review_assignment_opt_out"),
|
||||
from .views import (
|
||||
review_section,
|
||||
review_status,
|
||||
review_list,
|
||||
review_admin,
|
||||
review_bulk_accept,
|
||||
result_notification,
|
||||
result_notification_prepare,
|
||||
result_notification_send,
|
||||
review_detail,
|
||||
review_delete,
|
||||
review_assignments,
|
||||
review_assignment_opt_out,
|
||||
)
|
||||
|
||||
urlpatterns = [
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/all/$", review_section, {"reviewed": "all"}, name="review_section"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/reviewed/$", review_section, {"reviewed": "reviewed"}, name="user_reviewed"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/not_reviewed/$", review_section, {"reviewed": "not_reviewed"}, name="user_not_reviewed"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/assignments/$", review_section, {"assigned": True}, name="review_section_assignments"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/status/$", review_status, name="review_status"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/status/(?P<key>\w+)/$", review_status, name="review_status"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/list/(?P<user_pk>\d+)/$", review_list, name="review_list_user"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/admin/$", review_admin, name="review_admin"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/admin/accept/$", review_bulk_accept, name="review_bulk_accept"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/notification/(?P<status>\w+)/$", result_notification, name="result_notification"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/notification/(?P<status>\w+)/prepare/$", result_notification_prepare, name="result_notification_prepare"),
|
||||
url(r"^section/(?P<section_slug>[\w\-]+)/notification/(?P<status>\w+)/send/$", result_notification_send, name="result_notification_send"),
|
||||
|
||||
url(r"^review/(?P<pk>\d+)/$", review_detail, name="review_detail"),
|
||||
|
||||
url(r"^(?P<pk>\d+)/delete/$", review_delete, name="review_delete"),
|
||||
url(r"^assignments/$", review_assignments, name="review_assignments"),
|
||||
url(r"^assignment/(?P<pk>\d+)/opt-out/$", review_assignment_opt_out, name="review_assignment_opt_out")
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,24 +1,33 @@
|
|||
from __future__ import unicode_literals
|
||||
from django.conf.urls import url, patterns
|
||||
from django.conf.urls import url
|
||||
|
||||
|
||||
urlpatterns = patterns(
|
||||
"symposion.schedule.views",
|
||||
url(r"^$", "schedule_conference", name="schedule_conference"),
|
||||
url(r"^edit/$", "schedule_edit", name="schedule_edit"),
|
||||
url(r"^list/$", "schedule_list", name="schedule_list"),
|
||||
url(r"^presentations.csv$", "schedule_list_csv", name="schedule_list_csv"),
|
||||
url(r"^presentation/(\d+)/$", "schedule_presentation_detail",
|
||||
name="schedule_presentation_detail"),
|
||||
url(r"^([\w\-]+)/$", "schedule_detail", name="schedule_detail"),
|
||||
url(r"^([\w\-]+)/edit/$", "schedule_edit", name="schedule_edit"),
|
||||
url(r"^([\w\-]+)/list/$", "schedule_list", name="schedule_list"),
|
||||
url(r"^([\w\-]+)/presentations.csv$", "schedule_list_csv",
|
||||
name="schedule_list_csv"),
|
||||
url(r"^([\w\-]+)/edit/slot/(\d+)/", "schedule_slot_edit",
|
||||
name="schedule_slot_edit"),
|
||||
url(r"^conference.json", "schedule_json", name="schedule_json"),
|
||||
url(r"^sessions/staff.txt$", "session_staff_email", name="schedule_session_staff_email"),
|
||||
url(r"^sessions/$", "session_list", name="schedule_session_list"),
|
||||
url(r"^session/(\d+)/$", "session_detail", name="schedule_session_detail"),
|
||||
from .views import (
|
||||
schedule_conference,
|
||||
schedule_edit,
|
||||
schedule_list,
|
||||
schedule_list_csv,
|
||||
schedule_presentation_detail,
|
||||
schedule_detail,
|
||||
schedule_slot_edit,
|
||||
schedule_json,
|
||||
session_staff_email,
|
||||
session_list,
|
||||
session_detail,
|
||||
)
|
||||
|
||||
urlpatterns = [
|
||||
url(r"^$", schedule_conference, name="schedule_conference"),
|
||||
url(r"^edit/$", schedule_edit, name="schedule_edit"),
|
||||
url(r"^list/$", schedule_list, name="schedule_list"),
|
||||
url(r"^presentations.csv$", schedule_list_csv, name="schedule_list_csv"),
|
||||
url(r"^presentation/(\d+)/$", schedule_presentation_detail, name="schedule_presentation_detail"),
|
||||
url(r"^([\w\-]+)/$", schedule_detail, name="schedule_detail"),
|
||||
url(r"^([\w\-]+)/edit/$", schedule_edit, name="schedule_edit"),
|
||||
url(r"^([\w\-]+)/list/$", schedule_list, name="schedule_list"),
|
||||
url(r"^([\w\-]+)/presentations.csv$", schedule_list_csv, name="schedule_list_csv"),
|
||||
url(r"^([\w\-]+)/edit/slot/(\d+)/", schedule_slot_edit, name="schedule_slot_edit"),
|
||||
url(r"^conference.json", schedule_json, name="schedule_json"),
|
||||
url(r"^sessions/staff.txt$", session_staff_email, name="schedule_session_staff_email"),
|
||||
url(r"^sessions/$", session_list, name="schedule_session_list"),
|
||||
url(r"^session/(\d+)/$", session_detail, name="schedule_session_detail"),
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,14 +1,18 @@
|
|||
from __future__ import unicode_literals
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
|
||||
urlpatterns = patterns(
|
||||
"symposion.speakers.views",
|
||||
url(r"^create/$", "speaker_create", name="speaker_create"),
|
||||
url(r"^create/(\w+)/$", "speaker_create_token",
|
||||
name="speaker_create_token"),
|
||||
url(r"^edit/(?:(?P<pk>\d+)/)?$", "speaker_edit", name="speaker_edit"),
|
||||
url(r"^profile/(?P<pk>\d+)/$", "speaker_profile", name="speaker_profile"),
|
||||
url(r"^staff/create/(\d+)/$", "speaker_create_staff",
|
||||
name="speaker_create_staff"),
|
||||
from .views import (
|
||||
speaker_create,
|
||||
speaker_create_token,
|
||||
speaker_edit,
|
||||
speaker_profile,
|
||||
speaker_create_staff
|
||||
)
|
||||
|
||||
urlpatterns = [
|
||||
url(r"^create/$", speaker_create, name="speaker_create"),
|
||||
url(r"^create/(\w+)/$", speaker_create_token, name="speaker_create_token"),
|
||||
url(r"^edit/(?:(?P<pk>\d+)/)?$", speaker_edit, name="speaker_edit"),
|
||||
url(r"^profile/(?P<pk>\d+)/$", speaker_profile, name="speaker_profile"),
|
||||
url(r"^staff/create/(\d+)/$", speaker_create_staff, name="speaker_create_staff"),
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,12 +1,17 @@
|
|||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
from django.views.generic import TemplateView
|
||||
|
||||
|
||||
urlpatterns = patterns(
|
||||
"symposion.sponsorship.views",
|
||||
url(r"^$", TemplateView.as_view(template_name="symposion/sponsorship/list.html"), name="sponsor_list"),
|
||||
url(r"^apply/$", "sponsor_apply", name="sponsor_apply"),
|
||||
url(r"^add/$", "sponsor_add", name="sponsor_add"),
|
||||
url(r"^ziplogos/$", "sponsor_zip_logo_files", name="sponsor_zip_logos"),
|
||||
url(r"^(?P<pk>\d+)/$", "sponsor_detail", name="sponsor_detail"),
|
||||
from .views import (
|
||||
sponsor_apply,
|
||||
sponsor_add,
|
||||
sponsor_zip_logo_files,
|
||||
sponsor_detail
|
||||
)
|
||||
|
||||
urlpatterns = [
|
||||
url(r"^$", TemplateView.as_view(template_name="symposion/sponsorship/list.html"), name="sponsor_list"),
|
||||
url(r"^apply/$", sponsor_apply, name="sponsor_apply"),
|
||||
url(r"^add/$", sponsor_add, name="sponsor_add"),
|
||||
url(r"^ziplogos/$", sponsor_zip_logo_files, name="sponsor_zip_logos"),
|
||||
url(r"^(?P<pk>\d+)/$", sponsor_detail, name="sponsor_detail"),
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,17 +1,25 @@
|
|||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
|
||||
urlpatterns = patterns(
|
||||
"symposion.teams.views",
|
||||
from .views import (
|
||||
team_detail,
|
||||
team_join,
|
||||
team_leave,
|
||||
team_apply,
|
||||
team_promote,
|
||||
team_demote,
|
||||
team_accept,
|
||||
team_reject
|
||||
)
|
||||
urlpatterns = [
|
||||
# team specific
|
||||
url(r"^(?P<slug>[\w\-]+)/$", "team_detail", name="team_detail"),
|
||||
url(r"^(?P<slug>[\w\-]+)/join/$", "team_join", name="team_join"),
|
||||
url(r"^(?P<slug>[\w\-]+)/leave/$", "team_leave", name="team_leave"),
|
||||
url(r"^(?P<slug>[\w\-]+)/apply/$", "team_apply", name="team_apply"),
|
||||
url(r"^(?P<slug>[\w\-]+)/$", team_detail, name="team_detail"),
|
||||
url(r"^(?P<slug>[\w\-]+)/join/$", team_join, name="team_join"),
|
||||
url(r"^(?P<slug>[\w\-]+)/leave/$", team_leave, name="team_leave"),
|
||||
url(r"^(?P<slug>[\w\-]+)/apply/$", team_apply, name="team_apply"),
|
||||
|
||||
# membership specific
|
||||
url(r"^promote/(?P<pk>\d+)/$", "team_promote", name="team_promote"),
|
||||
url(r"^demote/(?P<pk>\d+)/$", "team_demote", name="team_demote"),
|
||||
url(r"^accept/(?P<pk>\d+)/$", "team_accept", name="team_accept"),
|
||||
url(r"^reject/(?P<pk>\d+)/$", "team_reject", name="team_reject"),
|
||||
)
|
||||
url(r"^promote/(?P<pk>\d+)/$", team_promote, name="team_promote"),
|
||||
url(r"^demote/(?P<pk>\d+)/$", team_demote, name="team_demote"),
|
||||
url(r"^accept/(?P<pk>\d+)/$", team_accept, name="team_accept"),
|
||||
url(r"^reject/(?P<pk>\d+)/$", team_reject, name="team_reject"),
|
||||
]
|
||||
|
|
|
|||
Loading…
Reference in a new issue