Merge branch 'master' into front-end

This commit is contained in:
Mehal Kashyap 2022-12-11 17:22:16 -05:00 committed by GitHub
commit fd9b2ce10a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View file

@ -175,8 +175,8 @@
<label class="col-3" for="payed_for">{{ _("For whom?") }}</label>
<div id="payed_for" class="controls col-9">
<p>
<a class="badge badge-secondary" href="#" classid="selectall" onclick="selectCheckboxes(true)">{{ _("Everyone") }}</a>
<a class="badge badge-secondary" href="#" id="selectnone" onclick="selectCheckboxes(false)">{{_("No one")}}</a>
<a class="badge badge-secondary" href="#" classid="selectall" onclick="selectCheckboxes(true)">{{ _("Everyone!!!!!!!") }}</a>
<a class="badge badge-secondary" href="#" id="selectnone" onclick="selectCheckboxes(false)">{{_("No one!!!")}}</a>
</p>
<div class="d-flex flex-column flex-wrap overflow-auto" style="max-height: 20em;">
{% for key, value, checked in form.payed_for.iter_choices() | sort(attribute='1') %}

View file

@ -748,7 +748,7 @@ def add_bill():
return render_template("add_bill.html", form=form)
@main.route("/<project_id>/settle_bills/add", methods=["GET", "POST"])
def settle():
def settle_paid():
form = get_billform_for(g.project)
if request.method == "POST":
if form.validate():