YunoHost-Apps/ihatemoney_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/ihatemoney_ynh.git synced 2024-09-03 19:26:15 +02:00
Code Issues Activity Actions

Merge branch 'master' of git://github.com/spiral-project/ihatemoney

Browse source
This commit is contained in:
A.Avenel 2013-05-09 23:46:50 +02:00
commit cae50a7da2
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
budget/models.py
View file

@ -117,7 +117,10 @@ class Project(db.Model):
This method returns the status DELETED or DEACTIVATED regarding the This method returns the status DELETED or DEACTIVATED regarding the
changes made. changes made.
""" """
try:
person = Person.query.get(member_id, self) person = Person.query.get(member_id, self)
except orm.exc.NoResultFound:
return None
if not person.has_bills(): if not person.has_bills():
db.session.delete(person) db.session.delete(person)
db.session.commit() db.session.commit()

7
budget/tests.py
View file

@ -275,6 +275,13 @@ class BudgetTestCase(TestCase):
response = self.app.get("/raclette/members/1/delete") response = self.app.get("/raclette/members/1/delete")
self.assertEqual(response.status_code, 405) self.assertEqual(response.status_code, 405)
#delete user using POST method
self.app.post("/raclette/members/1/delete")
self.assertEqual(
len(models.Project.query.get("raclette").active_members), 0)
#try to delete an user already deleted
self.app.post("/raclette/members/1/delete")
def test_demo(self): def test_demo(self):
# test that a demo project is created if none is defined # test that a demo project is created if none is defined
self.assertEqual([], models.Project.query.all()) self.assertEqual([], models.Project.query.all())

2
budget/web.py
View file

@ -307,11 +307,11 @@ def reactivate(member_id):
@main.route("/<project_id>/members/<member_id>/delete", methods=["POST"]) @main.route("/<project_id>/members/<member_id>/delete", methods=["POST"])
def remove_member(member_id): def remove_member(member_id):
member = g.project.remove_member(member_id) member = g.project.remove_member(member_id)
if member:
if member.activated == False: if member.activated == False:
flash(_("User '%(name)s' has been deactivated", name=member.name)) flash(_("User '%(name)s' has been deactivated", name=member.name))
else: else:
flash(_("User '%(name)s' has been removed", name=member.name)) flash(_("User '%(name)s' has been removed", name=member.name))
return redirect(url_for(".list_bills")) return redirect(url_for(".list_bills"))