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

12
rowers/dataprep.py
View File

@@ -54,7 +54,7 @@ from rowers.models import strokedatafields
#allowedcolumns = [item[0] for item in rowingmetrics]
allowedcolumns = [key for key,value in strokedatafields.items()]
from async_messages import messages as a_messages
#from async_messages import messages as a_messages
import os
import zipfile
import pandas as pd
@@ -920,12 +920,6 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
for key, value in checks.items():
if not value:
allchecks = 0
if consistencychecks:
a_messages.error(
r.user, 'Failed consistency check: ' + key + ', autocorrected')
else:
pass
# a_messages.error(r.user,'Failed consistency check: '+key+', not corrected')
except ZeroDivisionError:
pass
@@ -1148,9 +1142,6 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
# submit email task to send email about breakthrough workout
if isbreakthrough:
a_messages.info(
r.user, 'It looks like you have a new breakthrough workout'
)
if r.getemailnotifications and not r.emailbounced:
job = myqueue(queuehigh,handle_sendemail_breakthrough,
w.id,
@@ -1161,7 +1152,6 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
# submit email task to send email about breakthrough workout
if ishard:
a_messages.info(r.user, 'That was a pretty hard workout')
if r.getemailnotifications and not r.emailbounced:
job = myqueue(queuehigh,handle_sendemail_hard,
w.id,

2
rowers/decorators.py
View File

@@ -42,7 +42,7 @@ def login_required_message(function=None, message=default_message):
to the log-in page if necessary.
"""
actual_decorator = user_passes_test(
lambda u: u.is_authenticated(),
lambda u: u.is_authenticated,
message=message,
)
if function:

33
rowers/middleware.py
View File

@@ -9,6 +9,7 @@ queuelow = django_rq.get_queue('low')
from rowers.tasks import handle_updatefitnessmetric,handle_sendemail_expired
from rowers.mytypes import otwtypes
from django.contrib import messages
from django.http import HttpResponse
def getrower(user):
try:
@@ -70,11 +71,18 @@ def do_update(user,mode='rower',days=42):
class PowerTimeFitnessMetricMiddleWare(object):
def process_request(self, request):
def __init__(self, get_response):
self.get_response = get_response
def __call__(self, request):
# Code to be executed before the view is called
if request.user.is_authenticated():
if request.user.is_authenticated:
result = do_update(request.user,mode='rower')
result = do_update(request.user,mode='water')
response = self.get_response(request)
return response
from django.shortcuts import redirect
@@ -93,8 +101,11 @@ allowed_paths = [
]
class GDPRMiddleWare(object):
def process_request(self, request):
if request.user.is_authenticated() and request.path not in allowed_paths:
def __init__(self, get_response):
self.get_response = get_response
def __call__(self, request):
if request.user.is_authenticated and request.path not in allowed_paths:
r = getrower(request.user)
nexturl = request.path
if 'optin' in nexturl:
@@ -104,9 +115,16 @@ class GDPRMiddleWare(object):
'/rowers/me/gdpr-optin/?next=%s' % nexturl
)
response = self.get_response(request)
return response
class RowerPlanMiddleWare(object):
def process_request(self, request):
if request.user.is_authenticated() and request.user.rower.rowerplan != 'basic':
def __init__(self, get_response):
self.get_response = get_response
def __call__(self, request):
if request.user.is_authenticated and request.user.rower.rowerplan != 'basic':
if request.user.rower.paymenttype == 'single':
if request.user.rower.planexpires < timezone.now().date():
messg = 'Your paid plan has expired. We have reset you to a free basic plan.'
@@ -122,3 +140,6 @@ class RowerPlanMiddleWare(object):
r.user.last_name,
str(r.planexpires))
response = self.get_response(request)
return response

1
rowers/tasks_standalone.py
View File

@@ -14,7 +14,6 @@ django.setup()
import time
from celery import app
from django_rq import job
from async_messages import message_user,messages
from rowers.models import Workout
from django.contrib.auth.models import User

2
rowers/tpstuff.py
View File

@@ -25,7 +25,7 @@ tpapilocation = "https://api.trainingpeaks.com"
from celery import Celery,app
from django_rq import job
import time
from async_messages import message_user,messages
#from async_messages import message_user,messages
oauth_data = {
'client_id': TP_CLIENT_ID,

838
rowers/urls.py
View File

File diff suppressed because it is too large Load Diff

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:

10
rowsandall_app/settings.py
View File

@@ -58,7 +58,7 @@ INSTALLED_APPS = [
'suit_rq',
'leaflet',
'django_rq',
'django_rq_dashboard',
# 'django_rq_dashboard',
# 'translation_manager',
'django_mailbox',
'rest_framework',
@@ -80,7 +80,7 @@ AUTHENTICATION_BACKENDS = (
'django.contrib.auth.backends.ModelBackend',
)
MIDDLEWARE_CLASSES = [
MIDDLEWARE = [
# 'django.middleware.cache.UpdateCacheMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.common.BrokenLinkEmailsMiddleware',
@@ -94,10 +94,9 @@ MIDDLEWARE_CLASSES = [
'corsheaders.middleware.CorsMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'oauth2_provider.middleware.OAuth2TokenMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'async_messages.middleware.AsyncMiddleware',
# 'async_messages.middleware.AsyncMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'tz_detect.middleware.TimezoneMiddleware',
'rowers.middleware.GDPRMiddleWare',
@@ -389,8 +388,7 @@ REST_FRAMEWORK = {
'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.BasicAuthentication',
'rest_framework.authentication.SessionAuthentication',
'oauth2_provider.ext.rest_framework.OAuth2Authentication',
# 'oauth2_provider.contrib.rest_framework.OAuth2Authentication',
'oauth2_provider.contrib.rest_framework.OAuth2Authentication',
),
'PAGE_SIZE': 20,
'DEFAULT_PAGINATION_CLASS':'rest_framework.pagination.LimitOffsetPagination',

89
rowsandall_app/urls.py
View File

@@ -5,15 +5,16 @@ The `urlpatterns` list routes URLs to views. For more information please see:
Examples:
Function views
1. Add an import: from my_app import views
2. Add a URL to urlpatterns: url(r'^$', views.home, name='home')
2. Add a URL to urlpatterns: re_path(r'^$', views.home, name='home')
Class-based views
1. Add an import: from other_app.views import Home
2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home')
2. Add a URL to urlpatterns: re_path(r'^$', Home.as_view(), name='home')
Including another URLconf
1. Import the include() function: from django.conf.urls import url, include
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
2. Add a URL to urlpatterns: re_path(r'^blog/', include('blog.urls'))
"""
from django.conf.urls import url,include
from django.urls import path, re_path
from django.conf import settings
from django.conf.urls.static import static
from django.contrib import admin
@@ -35,61 +36,53 @@ handler500 = 'rowers.views.error500_view'
urlpatterns = [
url('^', include('django.contrib.auth.urls')),
url(r'^django-rq/',include('django_rq.urls')),
url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'),
# url(r'^password_change_done/$',auth_views.PasswordChangeDoneView,name='password_change_done'),
url(r'^password_change/$',auth_views.password_change),
# url(r'^password_change/$',auth_views.PasswordChangeView,name='password_change'),
url(r'^password_reset/$',
auth_views.password_reset,
# auth_views.PasswordResetView,
re_path('^', include('django.contrib.auth.urls')),
re_path(r'^django-rq/',include('django_rq.urls')),
re_path(r'^password_change_done/$',auth_views.PasswordChangeDoneView,name='password_change_done'),
re_path(r'^password_change/$',auth_views.PasswordChangeView,name='password_change'),
re_path(r'^password_reset/$',
auth_views.PasswordResetView,
{'template_name': 'rowers/templates/registration/password_reset.html'},
name='password_reset'),
url(r'^password_reset/done/$',
auth_views.password_reset_done,
# auth_views.PasswordResetDoneView,
re_path(r'^password_reset/done/$',
auth_views.PasswordResetDoneView,
name='password_reset_done'),
url(r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$',
auth_views.password_reset_confirm,
# auth_views.PasswordResetConfirmView,
re_path(r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$',
auth_views.PasswordResetConfirmView,
name='password_reset_confirm'),
url(r'^reset/done/$',
auth_views.password_reset_complete,
# auth_views.PasswordResetCompleteView,
re_path(r'^reset/done/$',
auth_views.PasswordResetCompleteView,
name='password_reset_complete'),
]
urlpatterns += [
url(r'^robots\.txt$', TemplateView.as_view(template_name='robots.txt',
re_path(r'^robots\.txt$', TemplateView.as_view(template_name='robots.txt',
content_type='text/plain')),
url(r'^admin/', admin.site.urls),
url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework2')),
url(r'^$',rootview),
url(r'^getblogs/$',rowersviews.get_blog_posts),
url(r'^login/',
auth_views.login,
# auth_views.LoginView,
re_path(r'^admin/', admin.site.urls),
re_path(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework2')),
re_path(r'^$',rootview),
re_path(r'^getblogs/$',rowersviews.get_blog_posts),
re_path(r'^login/',
auth_views.LoginView,
name='login'),
url(r'^logout/$',
auth_views.logout,
# auth_views.LogoutView,
re_path(r'^logout/$',
auth_views.LogoutView,
{'next_page': '/'},
name='logout',),
url(r'^rowers/',include('rowers.urls')),
# url(r'^cvkbrno/',include('cvkbrno.urls')),
url(r'^admin/rq/',include('django_rq_dashboard.urls')),
url(r'^call\_back',rowersviews.rower_process_callback),
url(r'^stravacall\_back',rowersviews.rower_process_stravacallback),
url(r'^sporttracks\_callback',rowersviews.rower_process_sporttrackscallback),
url(r'^underarmour\_callback',rowersviews.rower_process_underarmourcallback),
url(r'^polarflowcallback',rowersviews.rower_process_polarcallback),
url(r'^runkeeper\_callback',rowersviews.rower_process_runkeepercallback),
url(r'^tp\_callback',rowersviews.rower_process_tpcallback),
url(r'^twitter\_callback',rowersviews.rower_process_twittercallback),
url(r'^i18n/', include('django.conf.urls.i18n')),
url(r'^tz_detect/', include('tz_detect.urls')),
url(r'^jsi18n/', django.views.i18n.javascript_catalog,name='jsi18n'),
re_path(r'^rowers/',include('rowers.urls')),
# re_path(r'^cvkbrno/',include('cvkbrno.urls')),
# re_path(r'^admin/rq/',include('django_rq_dashboard.urls')),
re_path(r'^call\_back',rowersviews.rower_process_callback),
re_path(r'^stravacall\_back',rowersviews.rower_process_stravacallback),
re_path(r'^sporttracks\_callback',rowersviews.rower_process_sporttrackscallback),
re_path(r'^underarmour\_callback',rowersviews.rower_process_underarmourcallback),
re_path(r'^polarflowcallback',rowersviews.rower_process_polarcallback),
re_path(r'^runkeeper\_callback',rowersviews.rower_process_runkeepercallback),
re_path(r'^tp\_callback',rowersviews.rower_process_tpcallback),
re_path(r'^twitter\_callback',rowersviews.rower_process_twittercallback),
re_path(r'^i18n/', include('django.conf.urls.i18n')),
re_path(r'^tz_detect/', include('tz_detect.urls')),
# re_path(r'^jsi18n/', django.views.i18n.javascript_catalog,name='jsi18n'),
]
@@ -97,8 +90,8 @@ if settings.DEBUG:
import debug_toolbar
import django
urlpatterns += [
# url(r'^__debug__/','debug_toolbar.urls'),
url(r'^static/(?P<path>.*)$',
# re_path(r'^__debug__/','debug_toolbar.urls'),
re_path(r'^static/(?P<path>.*)$',
django.views.static.serve,
kwargs={'document_root': settings.STATIC_ROOT,}
)

3
rowsandall_app/views.py
View File

@@ -1,5 +1,4 @@
from django.shortcuts import render, redirect, render_to_response
from django.template.loader import render_to_string
from django.shortcuts import render, redirect
from django.template import RequestContext
from django.conf import settings
from rowers.forms import LoginForm