Hide useless links to members better

Improves commit 17d8ef0
Still display links when the filtered contributions or transactions are a child's ones.

diff --git a/galette/templates/default/pages/contributions_list.html.twig b/galette/templates/default/pages/contributions_list.html.twig
index 1b5dbbd99c5a63f602bf449a2092de7bd6d86054..a4764d521e56e69753d80b11e730b894e4f2e9f7 100644 (file)
--- a/galette/templates/default/pages/contributions_list.html.twig
+++ b/galette/templates/default/pages/contributions_list.html.twig
@@ -96,12 +96,19 @@
             <div class="ui compact vertically fitted segment">
             <div class="ui horizontal list">
             <span class="ui primary ribbon label">
-            {% if login.isAdmin() or login.isStaff() or member.hasChildren() %}
+            {% set member_logged_in_as = member.name ~ " " ~ member.surname ~ " (" ~ member.login ~ ")" %}
+            {% if login.isAdmin() or login.isStaff() or member.hasChildren() or (member.hasParent() and (member_logged_in_as != login.loggedInAs(true))) %}
                 <a
                     href="{{ url_for("contributions", {"type": "contributions", "option": "member", "value": "all"}) }}"
                 >
                     <i class="icon times tooltip"></i>
-                    <span class="ui special popup">{{ _T("Show all members contributions") }}</span>
+                    <span class="ui special popup">
+                        {% if member.hasChildren() or (member.hasParent() and (member_logged_in_as != login.loggedInAs(true))) %}
+                            {{ _T("Show all your contributions") }}
+                        {% else %}
+                            {{ _T("Show all members contributions") }}
+                        {% endif %}
+                    </span>
                 </a>
             {% endif %}
         {% endif %}

diff --git a/galette/templates/default/pages/transactions_list.html.twig b/galette/templates/default/pages/transactions_list.html.twig
index 87d8cb3e640f287c9762344d0833f5d1903a84e4..9da71773f617d937b1abf3a28451d1e30f944eb4 100644 (file)
--- a/galette/templates/default/pages/transactions_list.html.twig
+++ b/galette/templates/default/pages/transactions_list.html.twig
@@ -57,12 +57,19 @@
                 <div class="ui compact vertically fitted segment">
                 <div class="ui horizontal list">
                 <span class="ui primary ribbon label">
-                {% if login.isAdmin() or login.isStaff() or member.hasChildren() %}
+                {% set member_logged_in_as = member.name ~ " " ~ member.surname ~ " (" ~ member.login ~ ")" %}
+                {% if login.isAdmin() or login.isStaff() or member.hasChildren() or (member.hasParent() and (member_logged_in_as != login.loggedInAs(true))) %}
                     <a
                         href="{{ url_for("contributions", {"type": "transactions", "option": "member", "value": "all"}) }}"
                     >
                         <i class="icon times tooltip"></i>
-                        <span class="ui special popup">{{ _T("Show all members transactions") }}</span>
+                        <span class="ui special popup">
+                        {% if member.hasChildren() or (member.hasParent() and (member_logged_in_as != login.logged_in_as(true))) %}
+                            {{ _T("Show all your transactions") }}
+                        {% else %}
+                            {{ _T("Show all members transactions") }}
+                        {% endif %}
+                        </span>
                     </a>
                 {% endif %}
             {% endif %}