almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-05-14 08:21:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved the check function to the model

Browse source
This commit is contained in:
chestnutFan 2022-12-12 00:11:12 -05:00 committed by Alexis Métaireau
parent d6d9fd2180
commit 72320c19d7
No known key found for this signature in database
GPG key ID: 1C21B876828E5FF2
2 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ihatemoney/models.py
View file

@ -752,6 +752,22 @@ class Bill(db.Model):
else:
return 0
def involves_deactivated_members(self, project):
"""Check whether the bill contains deactivated member.
Return:
True if it contains deactivated member,
False if not.
"""
owers_id = [int(m.id) for m in self.owers]
bill_member_id_list = owers_id + [self.payer_id]
deactivated_member_number = (
Person.query.filter(Person.id.in_(bill_member_id_list))
.filter(Person.project_id == project.id)
.filter(Person.activated == False)
.count()
)
return deactivated_member_number != 0
def __str__(self):
return self.what

22
ihatemoney/web.py
View file

@ -800,13 +800,8 @@ def delete_bill(bill_id):
if not bill:
return redirect(url_for(".list_bills"))
# Prevent deleting if the bill involves deactivated user.
active_member_id = [m.id for m in g.project.active_members]
owers_id = [int(m.id) for m in bill.owers]
deactivated_members = set([bill.payer_id] + owers_id).difference(
set(active_member_id)
)
if len(deactivated_members):
# Check if the bill contains deactivated member. If yes, stop deleting.
if bill.involves_deactivated_members(g.project):
flash(
_("Deactivated users involved. This bill cannot be deleted."),
category="warning",
@ -827,21 +822,16 @@ def edit_bill(bill_id):
if not bill:
raise NotFound()
form = get_billform_for(g.project, set_default=False)
# Prevent editing if the bill involves deactivated user.
active_member_id = [m.id for m in g.project.active_members]
owers_id = [int(m.id) for m in bill.owers]
deactivated_members = set([bill.payer_id] + owers_id).difference(
set(active_member_id)
)
if len(deactivated_members):
# Check if the bill contains deactivated member. If yes, stop editing.
if bill.involves_deactivated_members(g.project):
flash(
_("Deactivated users involved. This bill cannot be edited."),
category="warning",
)
return redirect(url_for(".list_bills"))
form = get_billform_for(g.project, set_default=False)
if request.method == "POST" and form.validate():
form.save(bill, g.project)
db.session.commit()