Merge c97356cba7 into 4f9cad88bd

Do not display deactivated users when their balance is really small
Cases has been reported of rounding issues making deactivated users reapparing. This is due to the fact we're using floats (see #528 for details) Fixes #1336
2025-05-15 17:01:49 +02:00 · 2024-12-28 01:13:12 +00:00 · 2024-12-28 02:12:54 +01:00 · 2024-12-28 00:50:27 +01:00
3 changed files with 6 additions and 6 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -2,9 +2,9 @@ name: CI
 on:
  push:
-    branches: [ 'master', 'stable-*' ]
+    branches: [ 'main', 'stable-*' ]
  pull_request:
-    branches: [ 'master', 'stable-*' ]
+    branches: [ 'main', 'stable-*' ]
 jobs:
  lint:
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@ -3,9 +3,9 @@ name: Docker build
 on:
  push:
    tags: ['*']
-    branches: [ 'master', 'stable-*' ]
+    branches: [ 'main', 'stable-*' ]
  pull_request:
-    branches: [ 'master', 'stable-*' ]
+    branches: [ 'main', 'stable-*' ]
 jobs:
--- a/ihatemoney/templates/sidebar_table_layout.html
+++ b/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 %}
Author	SHA1	Message	Date
Alexis Métaireau	73c910c2a4	Merge `c97356cba7` into `4f9cad88bd`	2024-12-28 01:13:12 +00:00
Alexis Métaireau	c97356cba7	Do not display deactivated users when their balance is really small Cases has been reported of rounding issues making deactivated users reapparing. This is due to the fact we're using floats (see #528 for details) Fixes #1336	2024-12-28 02:12:54 +01:00
Alexis Métaireau	4f9cad88bd	Rename master to main Some checks failed CI / lint (push) Has been cancelled Details CI / docs (push) Has been cancelled Details Docker build / test (push) Has been cancelled Details CI / test (mariadb, minimal, 3.11) (push) Has been cancelled Details CI / test (mariadb, normal, 3.11) (push) Has been cancelled Details CI / test (mariadb, normal, 3.9) (push) Has been cancelled Details CI / test (postgresql, minimal, 3.11) (push) Has been cancelled Details CI / test (postgresql, normal, 3.11) (push) Has been cancelled Details CI / test (postgresql, normal, 3.9) (push) Has been cancelled Details CI / test (sqlite, minimal, 3.10) (push) Has been cancelled Details CI / test (sqlite, minimal, 3.11) (push) Has been cancelled Details CI / test (sqlite, minimal, 3.12) (push) Has been cancelled Details CI / test (sqlite, minimal, 3.9) (push) Has been cancelled Details CI / test (sqlite, normal, 3.10) (push) Has been cancelled Details CI / test (sqlite, normal, 3.11) (push) Has been cancelled Details CI / test (sqlite, normal, 3.12) (push) Has been cancelled Details CI / test (sqlite, normal, 3.8) (push) Has been cancelled Details CI / test (sqlite, normal, 3.9) (push) Has been cancelled Details Docker build / build_upload (push) Has been cancelled Details	2024-12-28 00:50:27 +01:00