1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-05-11 16:01:34 +00:00

Compare commits

..

No commits in common. "c5697c4cb4e62a4455126de7cd5ff11fc7fe4bf6" and "361de9f8b4b2be2d828c788dff2c50befab04b88" have entirely different histories.

3 changed files with 4384 additions and 4418 deletions

View File

@ -3760,44 +3760,12 @@
"note", "note",
"alias" "alias"
], ],
"query": "[\"AND\", {\"note__noteuser__user__memberships__club\": [\"club\"], \"note__noteuser__user__memberships__date_start__lte\": [\"today\"], \"note__noteuser__user__memberships__date_end__gte\": [\"today\"]}, {\"note__is_active\": true}]", "query": "[\"AND\", [\"OR\", {\"note__noteuser__user__memberships__club\": [\"club\"], \"note__noteuser__user__memberships__date_start__lte\": [\"today\"], \"note__noteuser__user__memberships__date_end__gte\": [\"today\"]}, {\"note__noteclub__isnull\": false}], {\"note__is_active\": true}]",
"type": "view", "type": "view",
"mask": 2, "mask": 1,
"field": "", "field": "",
"permanent": false, "permanent": false,
"description": "Voir les alias des notes des adhérent⋅es du club" "description": "Voir les alias des notes des clubs et des adhérent⋅es du club"
}
},
{
"model": "permission.permission",
"pk": 240,
"fields": {
"model": [
"note",
"alias"
],
"query": "[\"AND\", {\"note__noteuser__user__memberships__club\": [\"club\", \"parent_club\"], \"note__noteuser__user__memberships__date_start__lte\": [\"today\"], \"note__noteuser__user__memberships__date_end__gte\": [\"today\"]}, {\"note__is_active\": true}]",
"type": "view",
"mask": 2,
"field": "",
"permanent": false,
"description": "Voir les alias des notes des adhérent⋅es du club parent"
}
},
{
"model": "permission.permission",
"pk": 241,
"fields": {
"model": [
"auth",
"user"
],
"query": "[\"AND\", {\"memberships__club\": [\"club\", \"parent_club\"], \"memberships__date_start__lte\": [\"today\"], \"memberships__date_end__gte\": [\"today\"]}, {\"note__is_active\": true}]",
"type": "view",
"mask": 2,
"field": "",
"permanent": false,
"description": "Voir les utilisateurs adhérents au club parent"
} }
}, },
{ {
@ -3975,9 +3943,7 @@
182, 182,
184, 184,
185, 185,
239, 239
240,
241
] ]
} }
}, },

View File

@ -72,7 +72,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
<a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-cutlery"></i> {% trans 'Food' %}</a> <a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-cutlery"></i> {% trans 'Food' %}</a>
</li> </li>
{% endif %} {% endif %}
{% if user.is_authenticated %} {% if user.is_authenticated and user|is_member:"Kfet" %}
<li class="nav-item"> <li class="nav-item">
{% url 'note:transfer' as url %} {% url 'note:transfer' as url %}
<a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-exchange"></i> {% trans 'Transfer' %}</a> <a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-exchange"></i> {% trans 'Transfer' %}</a>