Merge branch 'New_permission' into 'main'

Draft: New permission See merge request bde/nk20!278
Update file initial.json
2025-02-05 23:03:02 +00:00 · 2025-01-18 12:57:45 +01:00 · 2025-01-18 12:57:42 +01:00 · 2025-01-06 00:11:01 +01:00 · 2025-01-05 23:17:01 +01:00
2 changed files with 11 additions and 5 deletions
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@ -4465,6 +4465,17 @@
            ]
        }
    },
+    {
+        "model": "permission.role",
+        "pk": 26,
+            "fields": {
+            "for_club": 282,
+            "name": "Tr\u00e9sorièr\u22c5e Gala",
+            "permissions": [
+                33
+            ]
+        }
+    },

    
    {
--- a/note_kfet/templates/base.html
+++ b/note_kfet/templates/base.html
@ -159,11 +159,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
    </nav>
    <div class="{% block containertype %}container{% endblock %} my-3">
 	<div id="messages">
-	    {% if user.is_authenticated %}
-		<div class="alert alert-info">
-		    Venez au festival des Sens de l'Art du 2 au 7 décembre 🐘 !
-		</div>
-	    {% endif %}
            {% if user.is_authenticated %}
                {% if not user|is_member:"BDE" %}
                    <div class="alert alert-danger">
Author	SHA1	Message	Date
thomasl	121f2f950f	Merge branch 'New_permission' into 'main' Draft: New permission See merge request bde/nk20!278	2025-01-18 12:57:45 +01:00
thomasl	43dc676747	Update file initial.json	2025-01-18 12:57:42 +01:00
mcngnt	787005e60d	Merge branch 'finito_sda' into 'main' finitio le message sda See merge request bde/nk20!279	2025-01-06 00:11:01 +01:00
mcngnt	414e103686	finitio le message sda	2025-01-05 23:17:01 +01:00