From 4c921549c20f6fe6c318814dea5e6d10072f94d5 Mon Sep 17 00:00:00 2001
From: Julien Constant <julienconstant190@gmail.com>
Date: Mon, 13 Mar 2023 11:35:31 +0100
Subject: [PATCH] Fix empty tools category on tools page

---
 core/templates/core/user_tools.jinja | 149 +++++++++++++++------------
 1 file changed, 83 insertions(+), 66 deletions(-)

diff --git a/core/templates/core/user_tools.jinja b/core/templates/core/user_tools.jinja
index 27b77cc6..e4bb6a96 100644
--- a/core/templates/core/user_tools.jinja
+++ b/core/templates/core/user_tools.jinja
@@ -34,82 +34,99 @@
             </div>
         {% endif %}
 
-        <div>
-            <h4>{% trans %}Counters{% endtrans %}</h4>
-            <ul>
-                {% if user.is_in_group(settings.SITH_GROUP_COUNTER_ADMIN_ID) or user.is_root %}
-                <li><a href="{{ url('counter:admin_list') }}">{% trans %}General counters management{% endtrans %}</a></li>
-                <li><a href="{{ url('counter:product_list') }}">{% trans %}Products management{% endtrans %}</a></li>
-                <li><a href="{{ url('counter:producttype_list') }}">{% trans %}Product types management{% endtrans %}</a></li>
-                <li><a href="{{ url('counter:cash_summary_list') }}">{% trans %}Cash register summaries{% endtrans %}</a></li>
-                <li><a href="{{ url('counter:invoices_call') }}">{% trans %}Invoices call{% endtrans %}</a></li>
-                <li><a href="{{ url('counter:eticket_list') }}">{% trans %}Etickets{% endtrans %}</a></li>
-                {% endif %}
-                {% for b in settings.SITH_COUNTER_BARS %}
-                    {% if user.is_in_group(b[1]+" admin") %}
-                    <li>
-                        <a href="{{ url('counter:details', counter_id=b[0]) }}">{{ b[1] }}</a> -
-                        <a href="{{ url('counter:admin', counter_id=b[0]) }}">{% trans %}Edit{% endtrans %}</a> -
-                        <a href="{{ url('counter:stats', counter_id=b[0]) }}">{% trans %}Stats{% endtrans %}</a> -
-                        {% set c = Counter.objects.filter(id=b[0]).first() %}
-                        {% if c.stock %}
-                        <a href="{{ url('stock:items_list', stock_id=c.stock.id)}}">Stock</a> -
-                        <a href="{{ url('stock:shoppinglist_list', stock_id=c.stock.id)}}">{% trans %}Shopping lists{% endtrans %}</a>
-                        {% else %}
-                        <a href="{{url('stock:new', counter_id=c.id)}}">{% trans %}Create new stock{% endtrans%}</a>
-                        {% endif %}
-                    </li>
+        {% set isAdminOnACounter = false %}
+        {% for b in settings.SITH_COUNTER_BARS if user.is_in_group(b[1] + " admin") %}
+            {% set isAdminOnACounter = true %}
+        {% endfor %}
+
+        {% if
+            user.is_in_group(settings.SITH_GROUP_COUNTER_ADMIN_ID) or user.is_root
+            or isAdminOnACounter
+        %}
+            <div>
+                <h4>{% trans %}Counters{% endtrans %}</h4>
+                <ul>
+                    {% if user.is_in_group(settings.SITH_GROUP_COUNTER_ADMIN_ID) or user.is_root %}
+                        <li><a href="{{ url('counter:admin_list') }}">{% trans %}General counters management{% endtrans %}</a></li>
+                        <li><a href="{{ url('counter:product_list') }}">{% trans %}Products management{% endtrans %}</a></li>
+                        <li><a href="{{ url('counter:producttype_list') }}">{% trans %}Product types management{% endtrans %}</a></li>
+                        <li><a href="{{ url('counter:cash_summary_list') }}">{% trans %}Cash register summaries{% endtrans %}</a></li>
+                        <li><a href="{{ url('counter:invoices_call') }}">{% trans %}Invoices call{% endtrans %}</a></li>
+                        <li><a href="{{ url('counter:eticket_list') }}">{% trans %}Etickets{% endtrans %}</a></li>
                     {% endif %}
-                {% endfor %}
-            </ul>
-        </div>
-        <div>
-            <h4>{% trans %}Accounting{% endtrans %}</h4>
-            <ul>
-                {% if user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) or user.is_root %}
-                <li><a href="{{ url('accounting:refound_account') }}">{% trans %}Refound Account{% endtrans %}</a></li>
-                <li><a href="{{ url('accounting:bank_list') }}">{% trans %}General accounting{% endtrans %}</a></li>
-                <li><a href="{{ url('accounting:co_list') }}">{% trans %}Company list{% endtrans %}</a></li>
-                {% endif %}
+                    {% for b in settings.SITH_COUNTER_BARS %}
+                        {% if user.is_in_group(b[1]+" admin") %}
+                            <li>
+                                <a href="{{ url('counter:details', counter_id=b[0]) }}">{{ b[1] }}</a> -
+                                <a href="{{ url('counter:admin', counter_id=b[0]) }}">{% trans %}Edit{% endtrans %}</a> -
+                                <a href="{{ url('counter:stats', counter_id=b[0]) }}">{% trans %}Stats{% endtrans %}</a> -
+                                {% set c = Counter.objects.filter(id=b[0]).first() %}
+                                {% if c.stock %}
+                                    <a href="{{ url('stock:items_list', stock_id=c.stock.id)}}">Stock</a> -
+                                    <a href="{{ url('stock:shoppinglist_list', stock_id=c.stock.id)}}">{% trans %}Shopping lists{% endtrans %}</a>
+                                {% else %}
+                                    <a href="{{url('stock:new', counter_id=c.id)}}">{% trans %}Create new stock{% endtrans%}</a>
+                                {% endif %}
+                            </li>
+                        {% endif %}
+                    {% endfor %}
+                </ul>
+            </div>
+        {% endif %}
 
-                {% for m in user.memberships.filter(end_date=None).filter(role__gte=7).all() -%}
-                    {%- for b in m.club.bank_accounts.all() %}
-                    <li>
-                        <strong>{% trans %}Bank account: {% endtrans %}</strong>
-                        <a href="{{ url('accounting:bank_details', b_account_id=b.id) }}">{{ b }}</a>
-                    </li>
-                    {%- endfor %}
+        {% if
+            user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) or user.is_root
+            or user.memberships.filter(end_date=None).filter(role__gte=7).all() | length > 10
+        %}
+            <div>
+                <h4>{% trans %}Accounting{% endtrans %}</h4>
+                <ul>
+                    {% if user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) or user.is_root %}
+                        <li><a href="{{ url('accounting:refound_account') }}">{% trans %}Refound Account{% endtrans %}</a></li>
+                        <li><a href="{{ url('accounting:bank_list') }}">{% trans %}General accounting{% endtrans %}</a></li>
+                        <li><a href="{{ url('accounting:co_list') }}">{% trans %}Company list{% endtrans %}</a></li>
+                    {% endif %}
 
-                    {% if m.club.club_account.exists() -%}
-                        {% for ca in m.club.club_account.all() %}
-                        <li>
-                            <strong>{% trans %}Club account: {% endtrans %}</strong>
-                            <a href="{{ url('accounting:club_details', c_account_id=ca.id) }}">{{ ca }}</a>
-                        </li>
+                    {% for m in user.memberships.filter(end_date=None).filter(role__gte=7).all() -%}
+                        {%- for b in m.club.bank_accounts.all() %}
+                            <li>
+                                <strong>{% trans %}Bank account: {% endtrans %}</strong>
+                                <a href="{{ url('accounting:bank_details', b_account_id=b.id) }}">{{ b }}</a>
+                            </li>
                         {%- endfor %}
-                    {%- endif -%}
-                {%- endfor %}
-            </ul>
-        </div>
+
+                        {% if m.club.club_account.exists() -%}
+                            {% for ca in m.club.club_account.all() %}
+                                <li>
+                                    <strong>{% trans %}Club account: {% endtrans %}</strong>
+                                    <a href="{{ url('accounting:club_details', c_account_id=ca.id) }}">{{ ca }}</a>
+                                </li>
+                            {%- endfor %}
+                        {%- endif -%}
+                    {%- endfor %}
+                </ul>
+            </div>
+        {% endif %}
+
         {% if user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID) or user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) or user.is_root %}
             <div>
                 <h4>{% trans %}Communication{% endtrans %}</h4>
                 <ul>
                     {% if user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) or user.is_root %}
-                    <li><a href="{{ url('com:weekmail_article') }}">{% trans %}Create weekmail article{% endtrans %}</a></li>
-                    <li><a href="{{ url('com:weekmail') }}">{% trans %}Weekmail{% endtrans %}</a></li>
-                    <li><a href="{{ url('com:weekmail_destinations') }}">{% trans %}Weekmail destinations{% endtrans %}</a></li>
-                    <li><a href="{{ url('com:news_new') }}">{% trans %}Create news{% endtrans %}</a></li>
-                    <li><a href="{{ url('com:news_admin_list') }}">{% trans %}Moderate news{% endtrans %}</a></li>
-                    <li><a href="{{ url('com:alert_edit') }}">{% trans %}Edit alert message{% endtrans %}</a></li>
-                    <li><a href="{{ url('com:info_edit') }}">{% trans %}Edit information message{% endtrans %}</a></li>
-                    <li><a href="{{ url('core:file_moderation') }}">{% trans %}Moderate files{% endtrans %}</a></li>
-                    <li><a href="{{ url('com:mailing_admin') }}">{% trans %}Mailing lists administration{% endtrans %}</a></li>
-                    <li><a href="{{ url('com:poster_list') }}">{% trans %}Posters{% endtrans %}</a></li>
-                    <li><a href="{{ url('com:screen_list') }}">{% trans %}Screens{% endtrans %}</a></li>
+                        <li><a href="{{ url('com:weekmail_article') }}">{% trans %}Create weekmail article{% endtrans %}</a></li>
+                        <li><a href="{{ url('com:weekmail') }}">{% trans %}Weekmail{% endtrans %}</a></li>
+                        <li><a href="{{ url('com:weekmail_destinations') }}">{% trans %}Weekmail destinations{% endtrans %}</a></li>
+                        <li><a href="{{ url('com:news_new') }}">{% trans %}Create news{% endtrans %}</a></li>
+                        <li><a href="{{ url('com:news_admin_list') }}">{% trans %}Moderate news{% endtrans %}</a></li>
+                        <li><a href="{{ url('com:alert_edit') }}">{% trans %}Edit alert message{% endtrans %}</a></li>
+                        <li><a href="{{ url('com:info_edit') }}">{% trans %}Edit information message{% endtrans %}</a></li>
+                        <li><a href="{{ url('core:file_moderation') }}">{% trans %}Moderate files{% endtrans %}</a></li>
+                        <li><a href="{{ url('com:mailing_admin') }}">{% trans %}Mailing lists administration{% endtrans %}</a></li>
+                        <li><a href="{{ url('com:poster_list') }}">{% trans %}Posters{% endtrans %}</a></li>
+                        <li><a href="{{ url('com:screen_list') }}">{% trans %}Screens{% endtrans %}</a></li>
                     {% endif %}
                     {% if user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID) %}
-                    <li><a href="{{ url('sas:moderation') }}">{% trans %}Moderate pictures{% endtrans %}</a></li>
+                        <li><a href="{{ url('sas:moderation') }}">{% trans %}Moderate pictures{% endtrans %}</a></li>
                     {% endif %}
                 </ul>
             </div>
@@ -142,7 +159,7 @@
                 <li><a href="{{ url('election:list') }}">{% trans %}See available elections{% endtrans %}</a></li>
                 <li><a href="{{ url('election:list_archived') }}">{% trans %}See archived elections{% endtrans %}</a></li>
                 {%- if user.is_subscribed -%}
-                <li><a href="{{ url('election:create') }}">{% trans %}Create a new election{% endtrans %}</a></li>
+                    <li><a href="{{ url('election:create') }}">{% trans %}Create a new election{% endtrans %}</a></li>
                 {%- endif -%}
             </ul>
         </div>