Merge branch 'release/v7.37'
This commit is contained in:
@@ -561,7 +561,8 @@ def workout_strava_upload(user,w):
|
|||||||
res,mes = handle_stravaexport(
|
res,mes = handle_stravaexport(
|
||||||
f,w.name,
|
f,w.name,
|
||||||
r.stravatoken,
|
r.stravatoken,
|
||||||
description=w.notes+'\n from '+w.workoutsource+' via rowsandall.com')
|
description=w.notes+'\n from '+w.workoutsource+' via rowsandall.com',
|
||||||
|
activity_type=r.stravaexportas)
|
||||||
if res==0:
|
if res==0:
|
||||||
message = mes
|
message = mes
|
||||||
w.uploadedtostrava = -1
|
w.uploadedtostrava = -1
|
||||||
|
|||||||
@@ -69,7 +69,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<th>ID</th>
|
<th>ID</th>
|
||||||
<th>Task</th>
|
<th>Task</th>
|
||||||
<th>Started</th>
|
<th>Started At</th>
|
||||||
<th>Progress</th>
|
<th>Progress</th>
|
||||||
<th>Status</th>
|
<th>Status</th>
|
||||||
<th>Action</th>
|
<th>Action</th>
|
||||||
|
|||||||
@@ -13300,6 +13300,9 @@ def virtualevents_view(request):
|
|||||||
)
|
)
|
||||||
|
|
||||||
def virtualevent_view(request,id=0):
|
def virtualevent_view(request,id=0):
|
||||||
|
|
||||||
|
results = []
|
||||||
|
|
||||||
if not request.user.is_anonymous():
|
if not request.user.is_anonymous():
|
||||||
r = getrower(request.user)
|
r = getrower(request.user)
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user