Private
Public Access
1
0

inheritance in gluing

This commit is contained in:
Sander Roosendaal
2017-11-26 08:32:47 +01:00
parent 0a98e3c27c
commit ec3a9700a5
2 changed files with 14 additions and 5 deletions

View File

@@ -196,6 +196,15 @@ def join_workouts(r,ids,title='Joined Workout',
# reorder in chronological order
ws = Workout.objects.filter(id__in=ids).order_by("date", "starttime")
if not parent:
parent = ws[0]
oarlength = parent.oarlength
inboard = parent.inboard
workouttype = parent.workouttype
notes = parent.notes
summary = parent.summary
files = [w.csvfilename for w in ws]
row = rdata(files[0])

View File

@@ -4225,11 +4225,11 @@ def workouts_join_view(request):
if message:
messages.error(request,message)
url = reverse(workout_edit_view,
kwargs = {
'id':int(id),
})
url = reverse(r.defaultlandingpage,
kwargs = {
'id':int(id),
})
return HttpResponseRedirect(url)
else: