almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-04-30 02:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add support for different categories of "flash alerts" (#594)

Browse source
This commit is contained in:
zorun 2020-04-26 23:17:48 +02:00 committed by GitHub
parent 08bb95422b
commit c509896b8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ihatemoney/templates/layout.html
View file

@ -125,9 +125,13 @@
</div> </div>
<div class="messages"> <div class="messages">
{% for message in get_flashed_messages() %} {% for category, message in get_flashed_messages(with_categories=true) %}
<div class="flash alert alert-success">{{ message }}</div> {% if category == "message" %}{# Default category for flash(msg) #}
{% endfor %} <div class="flash alert alert-success">{{ message }}</div>
{% else %}
<div class="flash alert alert-{{ category }}">{{ message }}</div>
{% endif %}
{% endfor %}
</div> </div>
{% block footer %} {% block footer %}

15
ihatemoney/web.py
View file

@ -310,19 +310,10 @@ def create_project():
try: try:
current_app.mail.send(msg) current_app.mail.send(msg)
except SMTPRecipientsRefused: except SMTPRecipientsRefused:
msg_compl = "Problem sending mail. " flash(_("Error while sending reminder email"), category="danger")
# TODO: destroy the project and cancel instead?
else:
msg_compl = ""
# redirect the user to the next step (invite) # redirect the user to the next step (invite)
flash( flash(_("The project identifier is %(project)s", project=project.id))
_(
"%(msg_compl)sThe project identifier is %(project)s",
msg_compl=msg_compl,
project=project.id,
)
)
return redirect(url_for(".list_bills", project_id=project.id)) return redirect(url_for(".list_bills", project_id=project.id))
return render_template("create_project.html", form=form) return render_template("create_project.html", form=form)
@ -395,7 +386,7 @@ def edit_project():
return redirect(url_for("main.list_bills")) return redirect(url_for("main.list_bills"))
except ValueError: except ValueError:
flash(_("Invalid JSON"), category="error") flash(_("Invalid JSON"), category="danger")
# Edit form # Edit form
if edit_form.validate_on_submit(): if edit_form.validate_on_submit():