almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-05-06 13:01:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed debugging, ran black

Browse source
This commit is contained in:
rosechar 2020-04-14 17:01:03 -04:00
parent 790d312073
commit 067aef2c46
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ihatemoney/models.py
View file

@ -394,9 +394,9 @@ class Bill(db.Model):
def to_json(self): def to_json(self):
bill_dict = self._to_serialize bill_dict = self._to_serialize
owers_list = [] owers_list = []
for ower in bill_dict['owers']: for ower in bill_dict["owers"]:
owers_list.append(ower.id) owers_list.append(ower.id)
bill_dict['owers'] = owers_list bill_dict["owers"] = owers_list
return bill_dict return bill_dict
def pay_each(self): def pay_each(self):

27
ihatemoney/web.py
View file

@ -112,8 +112,8 @@ def set_show_admin_dashboard_link(endpoint, values):
""" """
g.show_admin_dashboard_link = ( g.show_admin_dashboard_link = (
current_app.config["ACTIVATE_ADMIN_DASHBOARD"] current_app.config["ACTIVATE_ADMIN_DASHBOARD"]
and current_app.config["ADMIN_PASSWORD"] and current_app.config["ADMIN_PASSWORD"]
) )
@ -168,7 +168,7 @@ def admin():
if form.validate(): if form.validate():
# Valid password # Valid password
if check_password_hash( if check_password_hash(
current_app.config["ADMIN_PASSWORD"], form.admin_password.data current_app.config["ADMIN_PASSWORD"], form.admin_password.data
): ):
session["is_admin"] = True session["is_admin"] = True
session.update() session.update()
@ -226,9 +226,9 @@ def authenticate(project_id=None):
# else do form authentication or token authentication # else do form authentication or token authentication
is_post_auth = request.method == "POST" and form.validate() is_post_auth = request.method == "POST" and form.validate()
if ( if (
is_post_auth is_post_auth
and check_password_hash(project.password, form.password.data) and check_password_hash(project.password, form.password.data)
or token_auth or token_auth
): ):
# maintain a list of visited projects # maintain a list of visited projects
if "projects" not in session: if "projects" not in session:
@ -591,8 +591,8 @@ def list_bills():
# Preload the "owers" relationship for all bills # Preload the "owers" relationship for all bills
bills = ( bills = (
g.project.get_bills() g.project.get_bills()
.options(orm.subqueryload(Bill.owers)) .options(orm.subqueryload(Bill.owers))
.paginate(per_page=100, error_out=True) .paginate(per_page=100, error_out=True)
) )
return render_template( return render_template(
@ -623,8 +623,8 @@ def add_member():
def reactivate(member_id): def reactivate(member_id):
person = ( person = (
Person.query.filter(Person.id == member_id) Person.query.filter(Person.id == member_id)
.filter(Project.id == g.project.id) .filter(Project.id == g.project.id)
.all() .all()
) )
if person: if person:
person[0].activated = True person[0].activated = True
@ -705,7 +705,6 @@ def undo_delete_bill():
db.session.add(form.fake_form(bill, g.project)) db.session.add(form.fake_form(bill, g.project))
db.session.commit() db.session.commit()
print(bill.to_json())
return redirect(url_for(".list_bills")) return redirect(url_for(".list_bills"))
@ -721,7 +720,11 @@ def delete_bill(bill_id):
db.session.commit() db.session.commit()
url = url_for(".undo_delete_bill") url = url_for(".undo_delete_bill")
alert = 'The bill has been deleted <a class="alert-link" href="' + url + '" id="undo"> undo </a>' alert = (
'The bill has been deleted <a class="alert-link" href="'
+ url
+ '" id="undo"> undo </a>'
)
flash(Markup(alert)) flash(Markup(alert))
return redirect(url_for(".list_bills")) return redirect(url_for(".list_bills"))