diff --git a/members/filters.py b/members/filters.py index d32fbbe..1dc44a6 100644 --- a/members/filters.py +++ b/members/filters.py @@ -5,8 +5,8 @@ from .models import Member class MemberFilter(django_filters.FilterSet): - user__first_name = django_filters.CharFilter(field_name="user__first_name", label=_("First name")) - user__last_name = django_filters.CharFilter(field_name="user__last_name", label=_("Last name")) + user__first_name = django_filters.CharFilter(field_name="user__first_name", label=_("First name"), lookup_expr="icontains") + user__last_name = django_filters.CharFilter(field_name="user__last_name", label=_("Last name"), lookup_expr="icontains") license = django_filters.CharFilter(label=_("License"), lookup_expr="icontains") class Meta: diff --git a/templates/backend/base.html b/templates/backend/base.html index 430cbbb..de213ca 100644 --- a/templates/backend/base.html +++ b/templates/backend/base.html @@ -1,89 +1,20 @@ {% extends "base.html" %} +{% load rules %} + {% block sidebar %} -
-
Section 1
-
-
Item 1
-
Item 2
-
Item 3
-
-
+ {% url "backend:members:list" as members_list %} -
-
Section 1
-
-
Item 1
-
Item 2
-
Item 3
-
-
+ {% has_perm "members.member_manager" request.user as is_member_manager %} -
-
Section 1
-
-
Item 1
-
Item 2
-
Item 3
-
-
- -
-
Section 1
-
-
Item 1
-
Item 2
-
Item 3
-
-
- -
-
Section 2
-
-
Item 1
-
Item 2
-
-
- -
-
Section 3
-
-
Item 1
-
Item 2
-
-
- - - - {% comment %}
-
-
Members
- - - Members - - - - Members - -
- -
-
Members
- - - Members - -
-
- - - {% endcomment %} +
  • Members
  • + {% endif %} + + +
  • Dashboard
  • +
  • Calendar
  • +
  • Members
  • +
  • Settings
  • {% endblock sidebar %} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index fbd3914..4f6a293 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,9 +1,10 @@ {% load tailwind_tags %} {% load static %} +{% load avatar %} - + @@ -38,7 +39,7 @@ -