onny/verwaltungstracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make deletion not required, use deepcopy

Browse source
This commit is contained in:
Stefan Wehrmeyer 2022-03-23 12:58:01 +01:00
parent 1497678f71
commit 0a0e162910
3 changed files with 37 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

13
froide_govplan/forms.py
View file

@ -1,3 +1,5 @@
import copy
from django import forms
from django.contrib.auth import get_user_model
from django.utils import timezone
@ -141,7 +143,7 @@ class GovernmentPlanUpdateAcceptProposalForm(GovernmentPlanUpdateProposalForm):
super().__init__(*args, **kwargs)
def get_proposals(self):
data = dict(self.plan.proposals)
data = copy.deepcopy(self.plan.proposals)
user_ids = self.plan.proposals.keys()
user_map = {
str(u.id): u for u in get_user_model().objects.filter(id__in=user_ids)
@ -173,12 +175,15 @@ class GovernmentPlanUpdateAcceptProposalForm(GovernmentPlanUpdateProposalForm):
proposal_user = proposals[proposal_id]["user"]
update.user = proposal_user
delete_proposals.append(proposal_id)
self.delete_proposals(delete_proposals)
update.save()
return update
def delete_proposals(self, delete_proposals):
for pid in delete_proposals:
if pid in self.plan.proposals:
del self.plan.proposals[pid]
if not self.plan.proposals:
self.plan.proposals = None
self.plan.save(update_fields=["proposals"])
update.save()
return update