From 95f96361d7f936f31213078d4877036faaa04bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20H=C3=B8rl=C3=BCck=20Berg?= <36937807+henrikhorluck@users.noreply.github.com> Date: Sun, 17 Mar 2024 00:40:04 +0100 Subject: [PATCH] fixup! Link to admin panel instead of deleted dash-page --- templates/approval/dashboard/index.html | 2 +- templates/auth/dashboard/user_list.html | 114 ------------------------ 2 files changed, 1 insertion(+), 115 deletions(-) delete mode 100644 templates/auth/dashboard/user_list.html diff --git a/templates/approval/dashboard/index.html b/templates/approval/dashboard/index.html index efdb430d7..ea726bdd0 100644 --- a/templates/approval/dashboard/index.html +++ b/templates/approval/dashboard/index.html @@ -44,7 +44,7 @@

Ubehandlede søknader

{% for app in membership_applications %}
-
1.
{{ app.applicant.get_full_name }} +
1.
{{ app.applicant.get_full_name }}
2.
diff --git a/templates/auth/dashboard/user_list.html b/templates/auth/dashboard/user_list.html deleted file mode 100644 index 7cce1567a..000000000 --- a/templates/auth/dashboard/user_list.html +++ /dev/null @@ -1,114 +0,0 @@ -{% extends 'dashboard_base.html' %} -{% block title %}Brukerprofiler{% endblock %} - -{% block page-header %} -Brukerprofiler -{% endblock %} - -{% block breadcrumbs %} -
  • Autentisering
  • -{% if not search_results %} -
  • Brukerprofiler
  • -{% else %} -
  • Brukerprofiler
  • -
  • Søk på "{{ query }}"
  • -{% endif %} -{% endblock %} - -{% block content %} -
    -
    -
    -
    - Søk - - - - - - -
    -
    -
    - {% if is_paginated %} -
    -
    - {% if page_obj.has_previous %} - - {{ page_obj.previous_page_number }} - - {% endif %} - {# Current page #} - {{ page_obj.number }} - {% if page_obj.has_next %} - - {{ page_obj.next_page_number }} - - {% endif %} - {% if page_obj.next_page_number < page_obj.paginator.num_pages %} - - ... {{ page_obj.paginator.num_pages }} - - {% endif %} -
    -
    - {% endif %} -
    -
    -
    - - - - - - - - - - - - - {% for user in object_list %} - {% if query %}{% with user=user.object %} - - - - {% if user.member %} - - - - - {% else %} - - - - - {% endif %} - - {% endwith %}{% else %} - - - - {% if user.member %} - - - - - {% else %} - - - - - {% endif %} - - {% endif %} - {% endfor %} - -
    NavnNTNU-brukernavnBle medlemMedlemskap utløperNotatAktiv
    {{ user.get_full_name }}{% if user.ntnu_username %}{{ user.ntnu_username }}{% else %}-{% endif %}{{ user.member.registered|date:'Y-m-d' }}{% if user.member.is_active %}{{ user.member.expiration_date|date:'Y-m-d' }} - {% else %}{{ user.member.expiration_date|date:'T-m-d' }}{% endif %} - {{ user.member.note }}{% if user.member.is_active %}Ja{% else %}Nei{% endif %}----
    {{ user.get_full_name }}{% if user.ntnu_username %}{{ user.ntnu_username }}{% else %}-{% endif %}{{ user.member.registered|date:'Y-m-d' }}{% if user.member.is_active %}{{ user.member.expiration_date|date:'Y-m-d' }} - {% else %}{{ user.member.expiration_date|date:'T-m-d' }}{% endif %} - {{ user.member.note }}{% if user.member.is_active %}Ja{% else %}Nei{% endif %}----
    -
    -
    -{% endblock %}