From 7596729ec10fed7570f021bf7c5051a2ea2556cf Mon Sep 17 00:00:00 2001 From: Volodymyr Hotsyk Date: Sat, 5 Jul 2014 16:11:43 +0300 Subject: [PATCH] Update to Django=1.6 --- symposion/boxes/urls.py | 7 ++--- symposion/cms/urls.py | 5 ++-- symposion/conference/urls.py | 5 ++-- symposion/proposals/urls.py | 28 ++++++++++++-------- symposion/reviews/urls.py | 48 ++++++++++++++++++++++------------- symposion/schedule/urls.py | 14 ++++++---- symposion/speakers/urls.py | 11 +++++--- symposion/sponsorship/urls.py | 10 +++++--- symposion/teams/urls.py | 7 ++--- symposion/utils/mail.py | 10 ++++---- symposion/views.py | 10 +++++--- 11 files changed, 96 insertions(+), 59 deletions(-) diff --git a/symposion/boxes/urls.py b/symposion/boxes/urls.py index dc57fe6b..c7076c91 100644 --- a/symposion/boxes/urls.py +++ b/symposion/boxes/urls.py @@ -1,6 +1,7 @@ -from django.conf.urls.defaults import url, patterns +from django.conf.urls import url, patterns -urlpatterns = patterns("symposion.boxes.views", +urlpatterns = patterns( + "symposion.boxes.views", url(r"^([-\w]+)/edit/$", "box_edit", name="box_edit"), -) \ No newline at end of file +) diff --git a/symposion/cms/urls.py b/symposion/cms/urls.py index 3297ce53..b9893dd7 100644 --- a/symposion/cms/urls.py +++ b/symposion/cms/urls.py @@ -1,8 +1,9 @@ -from django.conf.urls.defaults import url, patterns +from django.conf.urls import url, patterns PAGE_RE = r"(([\w-]{1,})(/[\w-]{1,})*)/" -urlpatterns = patterns("symposion.cms.views", +urlpatterns = patterns( + "symposion.cms.views", url(r"^files/$", "file_index", name="file_index"), url(r"^files/create/$", "file_create", name="file_create"), url(r"^files/(\d+)/([^/]+)$", "file_download", name="file_download"), diff --git a/symposion/conference/urls.py b/symposion/conference/urls.py index 6bd44c16..43a42a5b 100644 --- a/symposion/conference/urls.py +++ b/symposion/conference/urls.py @@ -1,6 +1,7 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url -urlpatterns = patterns("symposion.conference.views", +urlpatterns = patterns( + "symposion.conference.views", url(r"^users/$", "user_list", name="user_list"), ) diff --git a/symposion/proposals/urls.py b/symposion/proposals/urls.py index 85e2bb1c..994fad30 100644 --- a/symposion/proposals/urls.py +++ b/symposion/proposals/urls.py @@ -1,18 +1,26 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url -urlpatterns = patterns("symposion.proposals.views", +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"^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+)/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"), + 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"), ) diff --git a/symposion/reviews/urls.py b/symposion/reviews/urls.py index 564bd35e..09264557 100644 --- a/symposion/reviews/urls.py +++ b/symposion/reviews/urls.py @@ -1,23 +1,37 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url -urlpatterns = patterns("symposion.reviews.views", - url(r"^section/(?P[\w\-]+)/all/$", "review_section", {"reviewed": "all"}, name="review_section"), - url(r"^section/(?P[\w\-]+)/reviewed/$", "review_section", {"reviewed": "reviewed"}, name="user_reviewed"), - url(r"^section/(?P[\w\-]+)/not_reviewed/$", "review_section", {"reviewed": "not_reviewed"}, name="user_not_reviewed"), - url(r"^section/(?P[\w\-]+)/assignments/$", "review_section", {"assigned": True}, name="review_section_assignments"), - url(r"^section/(?P[\w\-]+)/status/$", "review_status", name="review_status"), - url(r"^section/(?P[\w\-]+)/status/(?P\w+)/$", "review_status", name="review_status"), - url(r"^section/(?P[\w\-]+)/list/(?P\d+)/$", "review_list", name="review_list_user"), - url(r"^section/(?P[\w\-]+)/admin/$", "review_admin", name="review_admin"), - url(r"^section/(?P[\w\-]+)/admin/accept/$", "review_bulk_accept", name="review_bulk_accept"), - url(r"^section/(?P[\w\-]+)/notification/(?P\w+)/$", "result_notification", name="result_notification"), - url(r"^section/(?P[\w\-]+)/notification/(?P\w+)/prepare/$", "result_notification_prepare", name="result_notification_prepare"), - url(r"^section/(?P[\w\-]+)/notification/(?P\w+)/send/$", "result_notification_send", name="result_notification_send"), - +urlpatterns = patterns( + "symposion.reviews.views", + url(r"^section/(?P[\w\-]+)/all/$", "review_section", + {"reviewed": "all"}, name="review_section"), + url(r"^section/(?P[\w\-]+)/reviewed/$", "review_section", + {"reviewed": "reviewed"}, name="user_reviewed"), + url(r"^section/(?P[\w\-]+)/not_reviewed/$", "review_section", + {"reviewed": "not_reviewed"}, name="user_not_reviewed"), + url(r"^section/(?P[\w\-]+)/assignments/$", "review_section", + {"assigned": True}, name="review_section_assignments"), + url(r"^section/(?P[\w\-]+)/status/$", "review_status", + name="review_status"), + url(r"^section/(?P[\w\-]+)/status/(?P\w+)/$", + "review_status", name="review_status"), + url(r"^section/(?P[\w\-]+)/list/(?P\d+)/$", + "review_list", name="review_list_user"), + url(r"^section/(?P[\w\-]+)/admin/$", "review_admin", + name="review_admin"), + url(r"^section/(?P[\w\-]+)/admin/accept/$", + "review_bulk_accept", name="review_bulk_accept"), + url(r"^section/(?P[\w\-]+)/notification/(?P\w+)/$", + "result_notification", name="result_notification"), + url(r"^section/(?P[\w\-]+)/notification/(?P\w+)/prepare/$", + "result_notification_prepare", name="result_notification_prepare"), + url(r"^section/(?P[\w\-]+)/notification/(?P\w+)/send/$", + "result_notification_send", name="result_notification_send"), + url(r"^review/(?P\d+)/$", "review_detail", name="review_detail"), - + url(r"^(?P\d+)/delete/$", "review_delete", name="review_delete"), url(r"^assignments/$", "review_assignments", name="review_assignments"), - url(r"^assignment/(?P\d+)/opt-out/$", "review_assignment_opt_out", name="review_assignment_opt_out"), + url(r"^assignment/(?P\d+)/opt-out/$", "review_assignment_opt_out", + name="review_assignment_opt_out"), ) diff --git a/symposion/schedule/urls.py b/symposion/schedule/urls.py index 58890827..b227de61 100644 --- a/symposion/schedule/urls.py +++ b/symposion/schedule/urls.py @@ -1,15 +1,19 @@ -from django.conf.urls.defaults import url, patterns +from django.conf.urls import url, patterns -urlpatterns = patterns("symposion.schedule.views", +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"^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"^([\w\-]+)/presentations.csv$", "schedule_list_csv", + name="schedule_list_csv"), + url(r"^([\w\-]+)/edit/slot/(\d+)/", "schedule_slot_edit", + name="schedule_slot_edit"), ) diff --git a/symposion/speakers/urls.py b/symposion/speakers/urls.py index fa7055cf..fadead36 100644 --- a/symposion/speakers/urls.py +++ b/symposion/speakers/urls.py @@ -1,10 +1,13 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url -urlpatterns = patterns("symposion.speakers.views", +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"^create/(\w+)/$", "speaker_create_token", + name="speaker_create_token"), url(r"^edit/(?:(?P\d+)/)?$", "speaker_edit", name="speaker_edit"), url(r"^profile/(?P\d+)/$", "speaker_profile", name="speaker_profile"), - url(r"^staff/create/(\d+)/$", "speaker_create_staff", name="speaker_create_staff"), + url(r"^staff/create/(\d+)/$", "speaker_create_staff", + name="speaker_create_staff"), ) diff --git a/symposion/sponsorship/urls.py b/symposion/sponsorship/urls.py index e5d32bb0..8ae8c65d 100644 --- a/symposion/sponsorship/urls.py +++ b/symposion/sponsorship/urls.py @@ -1,9 +1,11 @@ -from django.conf.urls.defaults import patterns, url -from django.views.generic.simple import direct_to_template +from django.conf.urls import patterns, url +from django.views.generic import TemplateView -urlpatterns = patterns("symposion.sponsorship.views", - url(r"^$", direct_to_template, {"template": "sponsorship/list.html"}, name="sponsor_list"), +urlpatterns = patterns( + "symposion.sponsorship.views", + url(r"^$", TemplateView.as_view(template_name="sponsorship/list.html"), + name="sponsor_list"), url(r"^apply/$", "sponsor_apply", name="sponsor_apply"), url(r"^add/$", "sponsor_add", name="sponsor_add"), url(r"^(?P\d+)/$", "sponsor_detail", name="sponsor_detail"), diff --git a/symposion/teams/urls.py b/symposion/teams/urls.py index 01145f41..f6ddaf9d 100644 --- a/symposion/teams/urls.py +++ b/symposion/teams/urls.py @@ -1,13 +1,14 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url -urlpatterns = patterns("symposion.teams.views", +urlpatterns = patterns( + "symposion.teams.views", # team specific url(r"^(?P[\w\-]+)/$", "team_detail", name="team_detail"), url(r"^(?P[\w\-]+)/join/$", "team_join", name="team_join"), url(r"^(?P[\w\-]+)/leave/$", "team_leave", name="team_leave"), url(r"^(?P[\w\-]+)/apply/$", "team_apply", name="team_apply"), - + # membership specific url(r"^promote/(?P\d+)/$", "team_promote", name="team_promote"), url(r"^demote/(?P\d+)/$", "team_demote", name="team_demote"), diff --git a/symposion/utils/mail.py b/symposion/utils/mail.py index dc856871..59cdf09c 100644 --- a/symposion/utils/mail.py +++ b/symposion/utils/mail.py @@ -7,9 +7,9 @@ from django.contrib.sites.models import Site def send_email(to, kind, **kwargs): - + current_site = Site.objects.get_current() - + ctx = { "current_site": current_site, "STATIC_URL": settings.STATIC_URL, @@ -19,12 +19,12 @@ def send_email(to, kind, **kwargs): current_site.name, render_to_string("emails/%s/subject.txt" % kind, ctx).strip() ) - + message_html = render_to_string("emails/%s/message.html" % kind, ctx) message_plaintext = strip_tags(message_html) - + from_email = settings.DEFAULT_FROM_EMAIL - + email = EmailMultiAlternatives(subject, message_plaintext, from_email, to) email.attach_alternative(message_html, "text/html") email.send() diff --git a/symposion/views.py b/symposion/views.py index 669e2847..68e40559 100644 --- a/symposion/views.py +++ b/symposion/views.py @@ -12,18 +12,19 @@ import symposion.forms class SignupView(account.views.SignupView): - + form_class = symposion.forms.SignupForm form_kwargs = { "prefix": "signup", } - + def create_user(self, form, commit=True): user_kwargs = { "first_name": form.cleaned_data["first_name"], "last_name": form.cleaned_data["last_name"] } - return super(SignupView, self).create_user(form, commit=commit, **user_kwargs) + return super(SignupView, self).create_user(form, commit=commit, + **user_kwargs) def generate_username(self, form): def random_username(): @@ -51,5 +52,6 @@ class LoginView(account.views.LoginView): @login_required def dashboard(request): if request.session.get("pending-token"): - return redirect("speaker_create_token", request.session["pending-token"]) + return redirect("speaker_create_token", + request.session["pending-token"]) return render(request, "dashboard.html")