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

fixing bug

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-15 17:21:26 +02:00
parent e485f060e7
commit c785eca738
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/management/commands/autojoin.py
View File

@@ -50,15 +50,15 @@ class Command(BaseCommand):
for name, count in duplicates.items(): for name, count in duplicates.items():
if count > 1: if count > 1:
workouts = workouts.filter( workouts2 = workouts.filter(
Q(name__contains=name) Q(name__contains=name)
) )
duplicates2 = get_duplicates(w.date for w in workouts) duplicates2 = get_duplicates(w.date for w in workouts)
for dd, count in duplicates2.items(): for dd, count in duplicates2.items():
if count > 1: if count > 1:
workouts = workouts.filter(date=dd) workouts3 = workouts2.filter(date=dd)
ids = [w.id for w in workouts] ids = [w.id for w in workouts3]
id, message = join_workouts(r,ids,title=name, id, message = join_workouts(r,ids,title=name,
parent=workouts[0], parent=workouts3[0],
killparents=True) killparents=True)