jbdod/notes-ker-lann
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove wei

Browse source
This commit is contained in:
Marsupilami1 2022-07-31 14:16:24 +02:00
parent 94f5788922
commit 2343eabb59
64 changed files with 8 additions and 6945 deletions
Download patch file Download diff file Expand all files Collapse all files

5
apps/permission/fixtures/initial.json
View file

@ -2452,10 +2452,5 @@
181
]
}
},
{
"model": "wei.weirole",
"pk": 17,
"fields": {}
}
]

2
apps/permission/tables.py
View file

@ -40,7 +40,7 @@ class RightsTable(tables.Table):
| Q(name="Adhérent Kfet")
| Q(name="Membre de club")
| Q(name="Bureau de club"))
& Q(weirole__isnull=True))).all()
)).all()
s = ", ".join(str(role) for role in roles)
if PermissionBackend.check_perm(get_current_request(), "member.change_membership_roles", record):
s = format_html("<a href='" + str(reverse_lazy("member:club_manage_roles", kwargs={"pk": record.pk}))

1
apps/permission/templates/permission/all_rights.html
View file

@ -63,7 +63,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
data-target="#collapse{{ role|slugify }}"
aria-expanded="true" aria-controls="collapse{{ role|slugify }}">
{{ role }}
{% if role.weirole %}(<em>Pour le WEI</em>){% endif %}
{% if role.for_club %}(<em>Pour le club {{ role.for_club }} uniquement</em>){% endif %}
{% if role.clubs %}
<small><span class="badge badge-success">{% trans "Owned" %} :

2
apps/permission/views.py
View file

@ -135,7 +135,7 @@ class RightsView(TemplateView):
| Q(name="Adhérent Kfet")
| Q(name="Membre de club")
| Q(name="Bureau de club"))
& Q(weirole__isnull=True))))\
)))\
.order_by("club__name", "user__last_name")\
.distinct().all()
context["special_memberships_table"] = RightsTable(special_memberships, prefix="clubs-")