Implement django-view-decorator

This commit is contained in:
Víðir Valberg Guðmundsson 2024-01-14 12:27:36 +01:00
parent b8a970d5fe
commit f31cd62351
7 changed files with 49 additions and 26 deletions

View file

@ -21,6 +21,7 @@ dependencies = [
"whitenoise==6.6.0",
"django-zen-queries==2.1.0",
"django-registries==0.0.3",
"django-view-decorator==0.0.4",
]
dynamic = ["version"]

View file

@ -30,6 +30,7 @@ django==5.0.1
# django-allauth
# django-money
# django-registries
# django-view-decorator
# django-zen-queries
# membersystem (pyproject.toml)
django-allauth==0.60.0
@ -40,6 +41,8 @@ django-money==3.4.1
# via membersystem (pyproject.toml)
django-registries==0.0.3
# via membersystem (pyproject.toml)
django-view-decorator==0.0.4
# via membersystem (pyproject.toml)
django-zen-queries==2.1.0
# via membersystem (pyproject.toml)
environs[django]==10.0.0

View file

@ -1,6 +1,5 @@
from django.contrib.auth.decorators import login_required
from django.contrib.auth.decorators import permission_required
from django.utils.translation import gettext_lazy as _
from django_view_decorator import namespaced_decorator_factory
from .permissions import ADMINISTRATE_MEMBERS
from .selectors import get_member
@ -12,7 +11,14 @@ from utils.view_utils import render_list
from utils.view_utils import RowAction
@login_required
member_view = namespaced_decorator_factory(namespace="member", base_path="membership")
@member_view(
paths="",
name="membership-overview",
login_required=True,
)
def membership_overview(request):
memberships = get_memberships(member=request.user)
current_membership = memberships.current()
@ -33,8 +39,18 @@ def membership_overview(request):
)
@login_required
@permission_required(ADMINISTRATE_MEMBERS.path)
admin_members_view = namespaced_decorator_factory(
namespace="admin-members",
base_path="admin",
)
@admin_members_view(
paths="members/",
name="list",
login_required=True,
permissions=[ADMINISTRATE_MEMBERS.path],
)
def members_admin(request):
users = get_members()
@ -54,15 +70,19 @@ def members_admin(request):
row_actions=[
RowAction(
label=_("View"),
url_name="admin-members-detail",
url_name="admin-members:detail",
url_kwargs={"member_id": "id"},
),
],
)
@login_required
@permission_required(ADMINISTRATE_MEMBERS.path)
@admin_members_view(
paths="<int:member_id>/",
name="detail",
login_required=True,
permissions=[ADMINISTRATE_MEMBERS.path],
)
def members_admin_detail(request, member_id):
member = get_member(member_id=member_id)
subscription_periods = get_subscription_periods(member=member)
@ -70,7 +90,7 @@ def members_admin_detail(request, member_id):
context = {
"member": member,
"subscription_periods": subscription_periods,
"base_path": "admin-members",
"base_path": "admin-members:list",
}
return render(

View file

@ -40,6 +40,7 @@ DJANGO_APPS = [
THIRD_PARTY_APPS = [
"allauth",
"allauth.account",
"django_view_decorator",
]
LOCAL_APPS = [

View file

@ -66,7 +66,7 @@
{% if perms.membership.administrate_memberships %}
<li>
<a href="{% url "admin-members" %}" class="{% active_path "admin-members" "current" %}">
<a href="{% url "admin-members:list" %}" class="{% active_path "admin-members:list" "current" %}">
Admin
</a>
</li>

View file

@ -1,26 +1,12 @@
"""URLs for the membersystem"""
from django.conf import settings
from django.contrib import admin
from django.contrib.auth.decorators import login_required
from django.urls import include
from django.urls import path
from .views import index
from .views import services_overview
from membership.views import members_admin
from membership.views import members_admin_detail
from membership.views import membership_overview
from django_view_decorator import include_view_urls
urlpatterns = [
path("", login_required(index), name="index"),
path("services/", login_required(services_overview), name="services"),
path("membership/", membership_overview, name="membership-overview"),
path("admin/members/", members_admin, name="admin-members"),
path(
"admin/members/<int:member_id>/",
members_admin_detail,
name="admin-members-detail",
),
path("", include_view_urls(extra_modules=["project.views"])),
path("accounts/", include("allauth.urls")),
path("_admin/", admin.site.urls),
]

View file

@ -1,9 +1,21 @@
from django_view_decorator import view
from utils.view_utils import render
@view(
paths="",
name="index",
login_required=True,
)
def index(request):
return render(request, "index.html")
@view(
paths="services/",
name="services",
login_required=True,
)
def services_overview(request):
return render(request, "services_overview.html")