sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

passing checks with django 2.1.7

Browse Source
This commit is contained in:
Sander Roosendaal
2019-03-22 10:59:49 +01:00
parent bec008d429
commit da0842fc8b
16 changed files with 570 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
rowers/views/analysisviews.py
View File

@@ -155,8 +155,8 @@ def histo(request,theuser=0,
promember=0
mayedit=0
if not request.user.is_anonymous():
result = request.user.is_authenticated() and ispromember(request.user)
if not request.user.is_anonymous:
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember = 1
@@ -239,9 +239,9 @@ def cum_flex_data(
if theuser == 0:
theuser = request.user.id
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = getrower(request.user)
result = request.user.is_authenticated() and ispromember(request.user)
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember=1
@@ -337,9 +337,9 @@ def histo_data(
if theuser == 0:
theuser = request.user.id
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = getrower(request.user)
result = request.user.is_authenticated() and ispromember(request.user)
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember=1
@@ -543,8 +543,8 @@ def cum_flex(request,theuser=0,
promember=0
mayedit=0
if not request.user.is_anonymous():
result = request.user.is_authenticated() and ispromember(request.user)
if not request.user.is_anonymous:
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember = 1
@@ -649,7 +649,7 @@ def rankings_view(request,theuser=0,
theuser = request.user.id
promember=0
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = getrower(request.user)
if r.birthdate:
age = calculate_age(r.birthdate)
@@ -661,7 +661,7 @@ def rankings_view(request,theuser=0,
else:
worldclasspower = None
result = request.user.is_authenticated() and ispromember(request.user)
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember=1
@@ -1002,7 +1002,7 @@ def rankings_view2(request,theuser=0,
promember=0
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = getrower(request.user)
wcdurations = []
wcpower = []
@@ -1069,7 +1069,7 @@ def rankings_view2(request,theuser=0,
request.session['options'] = options
result = request.user.is_authenticated() and ispromember(request.user)
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember=1
@@ -1421,9 +1421,9 @@ def otwrankings_view(request,theuser=0,
theuser = request.user.id
promember=0
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = Rower.objects.get(user=request.user)
result = request.user.is_authenticated() and ispromember(request.user)
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember=1
@@ -1827,9 +1827,9 @@ def oterankings_view(request,theuser=0,
promember=0
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = Rower.objects.get(user=request.user)
result = request.user.is_authenticated() and ispromember(request.user)
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember=1
@@ -3372,9 +3372,9 @@ def cumstats(request,theuser=0,
if theuser == 0:
theuser = request.user.id
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = getrower(request.user)
result = request.user.is_authenticated() and ispromember(request.user)
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember=1

8
rowers/views/errorviews.py
View File

@@ -7,28 +7,28 @@ from rowers.views.statements import *
# Custom error pages with Rowsandall headers
def error500_view(request):
response = render_to_response('500.html', {},
response = render('500.html', {},
context_instance = RequestContext(request))
response.status_code = 500
return response
def error404_view(request):
response = render_to_response('404.html', {},
response = render('404.html', {},
context_instance = RequestContext(request))
response.status_code = 404
return response
def error400_view(request):
response = render_to_response('400.html', {},
response = render('400.html', {},
context_instance = RequestContext(request))
response.status_code = 400
return response
def error403_view(request):
response = render_to_response('403.html', {},
response = render('403.html', {},
context_instance = RequestContext(request))
response.status_code = 403

4
rowers/views/otherviews.py
View File

@@ -11,7 +11,7 @@ def deactivate_user(request):
pk = request.user.id
user = User.objects.get(pk=pk)
user_form = DeactivateUserForm(instance=user)
if request.user.is_authenticated() and request.user.id == user.id:
if request.user.is_authenticated and request.user.id == user.id:
if request.method == "POST":
user_form = DeactivateUserForm(request.POST, instance=user)
if user_form.is_valid():
@@ -80,7 +80,7 @@ def remove_user(request):
pk = request.user.id
user = User.objects.get(pk=pk)
user_form = DeleteUserForm(instance=user)
if request.user.is_authenticated() and request.user.id == user.id:
if request.user.is_authenticated and request.user.id == user.id:
if request.method == "POST":
user_form = DeleteUserForm(request.POST,instance=user)
if user_form.is_valid():

2
rowers/views/paymentviews.py
View File

@@ -6,7 +6,7 @@ from __future__ import unicode_literals
from rowers.views.statements import *
def paidplans_view(request):
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = request.user.rower
if r.paymentprocessor != 'braintree' and r.paymenttype == 'recurring':
messages.error(request,'Automated payment processing is currently only available through BrainTree (by PayPal). You are currently on a recurring payment plan with PayPal. Contact the site administrator at support@rowsandall.com before you proceed')

24
rowers/views/racesviews.py
View File

@@ -495,7 +495,7 @@ def virtualevents_view(request):
races = (races1 | races2).order_by("startdate","start_time")
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = getrower(request.user)
else:
r = None
@@ -687,7 +687,7 @@ def virtualevent_disqualify_view(request,raceid=0,recordid=0):
buttons = []
if not request.user.is_anonymous():
if not request.user.is_anonymous:
if race_can_register(r,race):
buttons += ['registerbutton']
@@ -724,7 +724,7 @@ def virtualevent_view(request,id=0):
results = []
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = getrower(request.user)
else:
r = None
@@ -757,7 +757,7 @@ def virtualevent_view(request,id=0):
)
if not request.user.is_anonymous():
if not request.user.is_anonymous:
if race_can_register(r,race):
buttons += ['registerbutton']
@@ -907,7 +907,7 @@ def virtualevent_ranking_view(request,id=0):
results = []
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = getrower(request.user)
else:
r = None
@@ -940,7 +940,7 @@ def virtualevent_ranking_view(request,id=0):
)
if not request.user.is_anonymous():
if not request.user.is_anonymous:
if race_can_register(r,race):
buttons += ['registerbutton']
@@ -1247,7 +1247,7 @@ def virtualevent_addboat_view(request,id=0):
buttons = []
if not request.user.is_anonymous():
if not request.user.is_anonymous:
if race_can_register(r,race):
buttons += ['registerbutton']
@@ -1401,7 +1401,7 @@ def virtualevent_register_view(request,id=0):
buttons = []
if not request.user.is_anonymous():
if not request.user.is_anonymous:
if race_can_register(r,race):
buttons += ['registerbutton']
@@ -1592,7 +1592,7 @@ def indoorvirtualevent_register_view(request,id=0):
buttons = []
if not request.user.is_anonymous():
if not request.user.is_anonymous:
if race_can_register(r,race):
buttons += ['registerbutton']
@@ -1940,7 +1940,7 @@ def virtualevent_edit_view(request,id=0):
buttons = []
if not request.user.is_anonymous():
if not request.user.is_anonymous:
if race_can_register(r,race):
buttons += ['registerbutton']
@@ -2039,7 +2039,7 @@ def indoorvirtualevent_edit_view(request,id=0):
buttons = []
if not request.user.is_anonymous():
if not request.user.is_anonymous:
if race_can_register(r,race):
buttons += ['registerbutton']
@@ -2254,7 +2254,7 @@ def virtualevent_submit_result_view(request,id=0,workoutid=0):
buttons = []
if not request.user.is_anonymous():
if not request.user.is_anonymous:
if race_can_register(r,race):
buttons += ['registerbutton']

33
rowers/views/statements.py
View File

@@ -60,10 +60,7 @@ from rowers.forms import (
disqualifiers,SearchForm,BillingForm,PlanSelectForm
)
try:
from django.core.urlresolvers import reverse, reverse_lazy
except ModuleNotFoundError:
from django.urls import reverse, reverse_lazy
from django.urls import reverse, reverse_lazy
from django.core.exceptions import PermissionDenied
from django.template import RequestContext
@@ -187,7 +184,7 @@ from rowers.tasks import (
)
from scipy.signal import savgol_filter
from django.shortcuts import render_to_response
#from django.shortcuts import render_to_response
try:
from Cookie import SimpleCookie
except ModuleNotFoundError:
@@ -268,7 +265,7 @@ def getfavorites(r,row):
return favorites,maxfav
def get_workout_default_page(request,id):
if request.user.is_anonymous():
if request.user.is_anonymous:
return reverse('workout_view',kwargs={'id':id})
else:
r = Rower.objects.get(user=request.user)
@@ -346,10 +343,10 @@ def getrequestplanrower(request,rowerid=0,userid=0,notpermanent=False):
def getrower(user):
try:
if user.is_anonymous():
if user.is_anonymous:
return None
except AttributeError:
if User.objects.get(id=user).is_anonymous():
if User.objects.get(id=user).is_anonymous:
return None
try:
r = Rower.objects.get(user=user)
@@ -767,7 +764,7 @@ def get_thumbnails(request,id):
r = getrower(request.user)
result = request.user.is_authenticated() and ispromember(request.user)
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember=1
if request.user == row.user.user:
@@ -998,21 +995,21 @@ from rowers.models import (
# Check if a user is a Coach member
def iscoachmember(user):
if not user.is_anonymous():
if not user.is_anonymous:
try:
r = Rower.objects.get(user=user)
except Rower.DoesNotExist:
r = Rower(user=user)
r.save()
result = user.is_authenticated() and (r.rowerplan=='coach')
result = user.is_authenticated and (r.rowerplan=='coach')
else:
result = False
return result
def cancreateteam(user):
if user.is_anonymous():
if user.is_anonymous:
return False
try:
@@ -1021,7 +1018,7 @@ def cancreateteam(user):
r = Rower(user=user)
r.save()
if user.is_authenticated() and (r.rowerplan=='coach'):
if user.is_authenticated and (r.rowerplan=='coach'):
return True
elif user.is_athenticated() and r.rowerplan in ['plan','pro']:
ts = Team.objects.filter(manager=user)
@@ -1030,16 +1027,16 @@ def cancreateteam(user):
# Check if a user can create planned sessions
def hasplannedsessions(user):
if not user.is_anonymous():
if not user.is_anonymous:
try:
r = Rower.objects.get(user=user)
except Rower.DoesNotExist:
r = Rower(user=user)
r.save()
result = user.is_authenticated() and (r.rowerplan=='coach' or r.rowerplan=='plan')
result = user.is_authenticated and (r.rowerplan=='coach' or r.rowerplan=='plan')
if not result and r.plantrialexpires:
result = user.is_authenticated() and r.plantrialexpires >= datetime.date.today()
result = user.is_authenticated and r.plantrialexpires >= datetime.date.today()
else:
result = False
@@ -1049,14 +1046,14 @@ from rowers.utils import isprorower,ProcessorCustomerError
# Check if a user is a Pro member
def ispromember(user):
if not user.is_anonymous():
if not user.is_anonymous:
try:
r = Rower.objects.get(user=user)
except Rower.DoesNotExist:
r = Rower(user=user)
r.save()
result = user.is_authenticated() and isprorower(r)
result = user.is_authenticated and isprorower(r)
else:
result = False
return result

44
rowers/views/workoutviews.py
View File

@@ -15,9 +15,9 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False):
promember=0
mayedit=0
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = getrower(request.user)
result = request.user.is_authenticated() and ispromember(request.user)
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember=1
if request.user == row.user.user:
@@ -91,9 +91,9 @@ def workout_histo_view(request,id=0):
promember=0
mayedit=0
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = getrower(request.user)
result = request.user.is_authenticated() and ispromember(request.user)
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember=1
if request.user == w.user.user:
@@ -395,9 +395,9 @@ def workout_recalcsummary_view(request,id=0):
redirect_field_name=None)
def workouts_join_view(request):
promember=0
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = getrower(request.user)
result = request.user.is_authenticated() and ispromember(request.user)
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember=1
@@ -813,9 +813,9 @@ def virtualevent_compare_view(request,id=0):
results = []
promember = 0
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = getrower(request.user)
result = request.user.is_authenticated() and ispromember(request.user)
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember=1
else:
@@ -1013,9 +1013,9 @@ def plannedsession_compare_view(request,id=0,userid=0):
@login_required()
def multi_compare_view(request,id=0,userid=0):
promember=0
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = getrower(request.user)
result = request.user.is_authenticated() and ispromember(request.user)
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember=1
@@ -1477,7 +1477,7 @@ def workout_fusion_list(request,id=0,message='',successmessage='',
def workout_view(request,id=0):
request.session['referer'] = absolute(request)['PATH']
if not request.user.is_anonymous():
if not request.user.is_anonymous:
rower = getrower(request.user)
else:
rower = None
@@ -2722,7 +2722,7 @@ def workout_workflow_view(request,id):
row = get_workout_permittedview(request.user,id)
r = getrower(request.user)
result = request.user.is_authenticated() and ispromember(request.user)
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember=1
if request.user == row.user.user:
@@ -2824,9 +2824,9 @@ def workout_flexchart3_view(request,*args,**kwargs):
promember=0
mayedit=0
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = getrower(request.user)
result = request.user.is_authenticated() and ispromember(request.user)
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember=1
if request.user == row.user.user:
@@ -2877,7 +2877,7 @@ def workout_flexchart3_view(request,*args,**kwargs):
else:
yparam2 = 'hr'
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = getrower(request.user)
if favoritenr>=0 and r.showfavoritechartnotes:
try:
@@ -2907,7 +2907,7 @@ def workout_flexchart3_view(request,*args,**kwargs):
workstrokesonly = False
if request.method == 'POST' and 'savefavorite' in request.POST:
if not request.user.is_anonymous():
if not request.user.is_anonymous:
workstrokesonly = request.POST['workstrokesonlysave']
reststrokes = not workstrokesonly
r = getrower(request.user)
@@ -3135,9 +3135,9 @@ def workout_otwpowerplot_view(request,id=0,message="",successmessage=""):
promember=0
mayedit=0
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = getrower(request.user)
result = request.user.is_authenticated() and ispromember(request.user)
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember=1
if request.user == w.user.user:
@@ -3609,9 +3609,9 @@ def workout_map_view(request,id=0):
mapdiv = ""
mayedit=0
if not request.user.is_anonymous():
if not request.user.is_anonymous:
r = getrower(request.user)
result = request.user.is_authenticated() and ispromember(request.user)
result = request.user.is_authenticated and ispromember(request.user)
if result:
promember=1
if request.user == w.user.user:
@@ -5242,9 +5242,9 @@ class WorkoutDelete(DeleteView):
mayedit=0
promember=0
if not self.request.user.is_anonymous():
if not self.request.user.is_anonymous:
r = getrower(self.request.user)
result = self.request.user.is_authenticated() and ispromember(self.request.user)
result = self.request.user.is_authenticated and ispromember(self.request.user)
if result:
promember=1
if self.request.user == self.object.user.user: