ynerant/nk20-scripts
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20-scripts synced 2025-06-14 21:17:29 +02:00
Code Issues Releases Wiki Activity

Compare commits

base: ynerant:694831a314aab57489f46c5f6fa24162b0e93b69
Branches Tags
ynerant:master
ynerant:borg_backup
ynerant:notes_report
..
compare: ynerant:043cc22f3c5e69fefe1e08e6055290e81c438e31
Branches Tags
ynerant:master
ynerant:borg_backup
ynerant:notes_report

No commits in common. "694831a314aab57489f46c5f6fa24162b0e93b69" and "043cc22f3c5e69fefe1e08e6055290e81c438e31" have entirely different histories.
694831a314 ... 043cc22f3c

1 changed files with 2 additions and 6 deletions
Show Stats Expand all files Collapse all files

8
management/commands/merge_club.py
View File

@ -3,7 +3,6 @@
import getpass
from time import sleep
from copy import copy
from django.conf import settings
from django.core.mail import mail_admins
@ -135,8 +134,7 @@ class Command(BaseCommand):
for tr in transactions:
if kwargs['verbosity'] >= 1:
self.stdout.write(f"Removing {tr}…")
tr_merge = copy(tr)
tr_merge.pk = None
tr_merge = tr
tr_merge.source = true_club.note
local_created.append(tr_merge)
if kwargs['verbosity'] >= 1:
@ -157,8 +155,7 @@ class Command(BaseCommand):
for tr in transactions:
if kwargs['verbosity'] >= 1:
self.stdout.write(f"Removing {tr}…")
tr_merge = copy(tr)
tr_merge.pk = None
tr_merge = tr
tr_merge.destination = true_club.note
local_created.append(tr_merge)
if kwargs['verbosity'] >= 1:
@ -282,7 +279,6 @@ class Command(BaseCommand):
for club in fake_clubs:
self.stdout.write(self.style.SUCCESS(f"Club {club} deleted and merge in {true_club}."))
deleted_clubs.append(clubs)
self.stdout.write(self.style.WARNING("There are problems with balance of inactive note impact by the fusion, run './manage.py check_consistency -a -f' to fix"))
deleted += local_deleted
created += local_created
edited += local_edited