ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'non-BDE-members' into 'main' 

Allow non-BDE members to use the note

See merge request bde/nk20!268
This commit is contained in:
bleizi 2024-09-05 23:15:04 +02:00
parent 5040e8e8ea c5697c4cb4
commit 33c94d0720
3 changed files with 4421 additions and 4353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8754
apps/permission/fixtures/initial.json
View File

File diff suppressed because it is too large Load Diff

8
apps/registration/views.py
View File

@ -300,9 +300,13 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
# join_bde = True # join_bde = True
# join_kfet = True # join_kfet = True
if not join_bde: if not (join_bde or any(b for _, b in join_clubs)):
# This software belongs to the BDE. # This software belongs to the BDE.
form.add_error('join_bde', _("You must join the BDE.")) form.add_error('join_bde', _("You must join a club."))
return super().form_invalid(form)
if join_kfet and not join_bde:
form.add_error('join_bde', _("You must also join the parent club BDE."))
return super().form_invalid(form) return super().form_invalid(form)
# Calculate required registration fee # Calculate required registration fee

12
note_kfet/templates/base.html
View File

@ -66,13 +66,13 @@ 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-coffee"></i> {% trans 'Consumptions' %}</a> <a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-coffee"></i> {% trans 'Consumptions' %}</a>
</li> </li>
{% endif %} {% endif %}
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<li class="nav-item"> <li class="nav-item">
{% url 'food:food_list' as url %} {% url 'food:food_list' as url %}
<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 and user|is_member:"Kfet" %} {% if user.is_authenticated %}
<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>