From d5986de8704332d3ae5e3a8beb13158e40b779fd Mon Sep 17 00:00:00 2001 From: Sachi King Date: Sun, 26 Mar 2017 11:50:10 +1100 Subject: [PATCH] Use django's login_required decorator This only seems to be here to have some custom login_url used bypassing django's model. Well as we want to use django's model, this just won't do. So lets move to using django's model. --- symposion/conference/views.py | 3 +-- symposion/proposals/views.py | 2 +- symposion/reviews/views.py | 3 +-- symposion/schedule/views.py | 2 +- symposion/speakers/views.py | 3 +-- symposion/sponsorship/views.py | 3 +-- symposion/teams/views.py | 3 +-- symposion/views.py | 4 +--- 8 files changed, 8 insertions(+), 15 deletions(-) diff --git a/symposion/conference/views.py b/symposion/conference/views.py index 7b107a7e..33e3b097 100644 --- a/symposion/conference/views.py +++ b/symposion/conference/views.py @@ -1,10 +1,9 @@ from django.http import Http404 from django.shortcuts import render +from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User -from account.decorators import login_required - @login_required def user_list(request): diff --git a/symposion/proposals/views.py b/symposion/proposals/views.py index c3fff8a4..0654f7a5 100644 --- a/symposion/proposals/views.py +++ b/symposion/proposals/views.py @@ -4,6 +4,7 @@ import random import sys from django.conf import settings +from django.contrib.auth.decorators import login_required from django.core.exceptions import ObjectDoesNotExist from django.core.urlresolvers import reverse from django.db.models import Q @@ -16,7 +17,6 @@ from django.contrib.auth.models import User from django.utils.translation import ugettext_lazy as _ -from account.decorators import login_required from account.models import EmailAddress from symposion.proposals.models import ( diff --git a/symposion/reviews/views.py b/symposion/reviews/views.py index 8c8015f9..a2904dbe 100644 --- a/symposion/reviews/views.py +++ b/symposion/reviews/views.py @@ -2,6 +2,7 @@ import csv import random import StringIO +from django.contrib.auth.decorators import login_required from django.core.mail import send_mass_mail from django.db.models import Q from django.http import HttpResponse @@ -10,8 +11,6 @@ from django.shortcuts import render, redirect, get_object_or_404 from django.template import Context, Template from django.views.decorators.http import require_POST -from account.decorators import login_required - # @@@ switch to pinax-teams from symposion.teams.models import Team diff --git a/symposion/schedule/views.py b/symposion/schedule/views.py index e7c2eedd..6e85a2fd 100644 --- a/symposion/schedule/views.py +++ b/symposion/schedule/views.py @@ -14,7 +14,7 @@ from django.contrib.sites.models import Site from django_ical.views import ICalFeed -from account.decorators import login_required +from django.contrib.auth.decorators import login_required from symposion.schedule.forms import SlotEditForm, ScheduleSectionForm from symposion.schedule.models import Schedule, Day, Slot, Presentation, Session, SessionRole diff --git a/symposion/speakers/views.py b/symposion/speakers/views.py index f60064e0..9ed32ec4 100644 --- a/symposion/speakers/views.py +++ b/symposion/speakers/views.py @@ -4,11 +4,10 @@ from django.http import Http404 from django.shortcuts import render, redirect, get_object_or_404 from django.contrib import messages +from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User from django.utils.translation import ugettext_lazy as _ -from account.decorators import login_required - from symposion.proposals.models import ProposalBase from symposion.speakers.forms import SpeakerForm from symposion.speakers.models import Speaker diff --git a/symposion/sponsorship/views.py b/symposion/sponsorship/views.py index 3f749900..d3bd47fe 100644 --- a/symposion/sponsorship/views.py +++ b/symposion/sponsorship/views.py @@ -13,13 +13,12 @@ from zipfile import ZipFile, ZipInfo from django.conf import settings from django.contrib import messages from django.contrib.admin.views.decorators import staff_member_required +from django.contrib.auth.decorators import login_required from django.http import Http404, HttpResponse from django.shortcuts import render_to_response, redirect, get_object_or_404 from django.template import RequestContext from django.utils.translation import ugettext_lazy as _ -from account.decorators import login_required - from symposion.sponsorship.forms import SponsorApplicationForm, \ SponsorDetailsForm, SponsorBenefitsFormSet from symposion.sponsorship.models import Benefit, Sponsor, SponsorBenefit, \ diff --git a/symposion/teams/views.py b/symposion/teams/views.py index 78cf7a88..be11be7f 100644 --- a/symposion/teams/views.py +++ b/symposion/teams/views.py @@ -3,10 +3,9 @@ from django.http import Http404, HttpResponseNotAllowed from django.shortcuts import render, redirect, get_object_or_404 from django.contrib import messages +from django.contrib.auth.decorators import login_required from django.utils.translation import ugettext_lazy as _ -from account.decorators import login_required - from symposion.utils.mail import send_email from symposion.teams.forms import TeamInvitationForm from symposion.teams.models import Team, Membership diff --git a/symposion/views.py b/symposion/views.py index 1cffbc11..a03545eb 100644 --- a/symposion/views.py +++ b/symposion/views.py @@ -1,11 +1,9 @@ from __future__ import unicode_literals +from django.contrib.auth.decorators import login_required from django.shortcuts import render, redirect -from account.decorators import login_required - - @login_required def dashboard(request): if request.session.get("pending-token"):