Merge 1621a45336 into 05742347c3

* Update forms.html

Added navigation element in 'Edit Participants' window

* Update forms.html

Updated button on form for editing participants--"Save" for edits instead of "Add."

ihatemoney/models.py

@@ -760,13 +760,13 @@ class Bill(db.Model):
         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))
+        bill_members = owers_id + [self.payer_id]
+        deactivated_members_count = (
+            Person.query.filter(Person.id.in_(bill_members))
             .filter(Person.activated.is_(False))
             .count()
         )
-        return deactivated_member_number != 0
+        return deactivated_member_count != 0
 
     def __str__(self):
         return self.what

ihatemoney/templates/forms.html

@@ -236,7 +236,8 @@
     {{ input(form.weight) }}
     </fieldset>
     <div class="actions">
-        {{ form.submit(class="btn btn-primary") }}
+        <button class="btn btn-secondary input-group-addon" type="submit">{{ _("Save") }}</button>
+        <a href="{{ url_for(".list_bills") }}" class="btn btn-outline-secondary"> {{_("Cancel") }} </a>
     </div>
 {% endmacro %}
 

ihatemoney/templates/sidebar_table_layout.html

@@ -11,7 +11,7 @@
         </tr>
       </thead>
     {%- endif %}
-    {%- for member in g.project.members | sort(attribute='name') if member.activated or balance[member.id]|round(2) != 0 %}
+    {%- for member in g.project.members | sort(attribute='name') if member.activated or balance[member.id]|round(2)|abs > 0.01 %}
       <tr id="bal-member-{{ member.id }}" action="{% if member.activated %}delete{% else %}reactivate{% endif %}">
         <td class="balance-name">{{ member.name }}
           {%- if show_weight -%}
@@ -61,4 +61,4 @@
 {% endblock %}
 
 {# It must be set outside of the block definition #}
-{% set messages_shown = True %}
+{% set messages_shown = True %}