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

Simplify delete proposals form method

Browse source
This commit is contained in:
Stefan Wehrmeyer 2022-05-09 12:37:22 +02:00
parent acac0908d2
commit 7be24fb7b1
1 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
froide_govplan/forms.py
View file

@ -187,24 +187,14 @@ class GovernmentPlanUpdateAcceptProposalForm(GovernmentPlanUpdateProposalForm):
update.organization = user_org update.organization = user_org
delete_proposals.append(proposal_id) delete_proposals.append(proposal_id)
self.delete_proposals(delete_proposals, proposals, proposal_id=proposal_id) self.delete_proposals(delete_proposals)
update.save() update.save()
return update return update
def delete_proposals(self, delete_proposals, proposals, proposal_id=None): def delete_proposals(self, delete_proposals):
for pid in delete_proposals: for pid in delete_proposals:
if pid in self.plan.proposals: if pid in self.plan.proposals:
del self.plan.proposals[pid] del self.plan.proposals[pid]
# if pid != proposal_id:
# proposal_user = proposals[pid]["user"]
# proposal_user.send_mail(
# _("Your proposal for the plan “%s” was rejected") % self.plan.title,
# _(
# "Hello,\n\nA moderator has rejected your proposal for an update "
# "to the plan “{title}”.\n\nAll the Best,\n{site_name}"
# ).format(title=self.plan.title, site_name=settings.SITE_NAME),
# priority=False,
# )
if not self.plan.proposals: if not self.plan.proposals:
self.plan.proposals = None self.plan.proposals = None
self.plan.save(update_fields=["proposals"]) self.plan.save(update_fields=["proposals"])