some bug fixing
This commit is contained in:
@@ -1398,6 +1398,8 @@ def new_workout_from_df(r, df,
|
|||||||
if parent:
|
if parent:
|
||||||
oarlength = parent.oarlength
|
oarlength = parent.oarlength
|
||||||
inboard = parent.inboard
|
inboard = parent.inboard
|
||||||
|
|
||||||
|
|
||||||
workouttype = parent.workouttype
|
workouttype = parent.workouttype
|
||||||
boattype = parent.boattype
|
boattype = parent.boattype
|
||||||
notes = parent.notes
|
notes = parent.notes
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ def do_update(user,mode='rower',days=42):
|
|||||||
|
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
|
||||||
class PowerTimeFitnessMetricMiddleWare(object):
|
class PowerTimeFitnessMetricMiddleWare(object):
|
||||||
def process_request(self, request):
|
def process_request(self, request):
|
||||||
# Code to be executed before the view is called
|
# Code to be executed before the view is called
|
||||||
|
|||||||
@@ -7009,6 +7009,8 @@ def workout_undo_smoothenpace_view(
|
|||||||
def workout_smoothenpace_view(request,id=0,message="",successmessage=""):
|
def workout_smoothenpace_view(request,id=0,message="",successmessage=""):
|
||||||
row = get_workout(id)
|
row = get_workout(id)
|
||||||
|
|
||||||
|
previousurl = request.META.get('HTTP_REFERER')
|
||||||
|
|
||||||
r = getrower(request.user)
|
r = getrower(request.user)
|
||||||
|
|
||||||
if (checkworkoutuser(request.user,row)==False):
|
if (checkworkoutuser(request.user,row)==False):
|
||||||
@@ -7040,11 +7042,14 @@ def workout_smoothenpace_view(request,id=0,message="",successmessage=""):
|
|||||||
row.write_csv(filename,gzip=True)
|
row.write_csv(filename,gzip=True)
|
||||||
dataprep.update_strokedata(id,row.df)
|
dataprep.update_strokedata(id,row.df)
|
||||||
|
|
||||||
url = reverse(r.defaultlandingpage,
|
if previousurl:
|
||||||
kwargs = {
|
url = previousurl
|
||||||
'id':id,
|
else:
|
||||||
|
url = reverse(r.defaultlandingpage,
|
||||||
|
kwargs = {
|
||||||
|
'id':id,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
return HttpResponseRedirect(url)
|
return HttpResponseRedirect(url)
|
||||||
|
|
||||||
@@ -11651,7 +11656,7 @@ def workout_fusion_view(request,id1=0,id2=1):
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
'url':reverse(workout_fusion_view,kwargs={'id1':id1,'id2':id2}),
|
'url':reverse(workout_fusion_view,kwargs={'id1':id1,'id2':id2}),
|
||||||
'name': 'Sensor Fusion'
|
'name': str(w2.id)
|
||||||
}
|
}
|
||||||
|
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user