admin/templates/admin_users.html

@@ -6,33 +6,14 @@
   <div class="col">
     <h3>{{ subtitle }}</h3>
   </div>
-  <div class="col-2">
-    <a href="{% url 'admin:new_user' %}" class="btn btn-green-admin">{% translate "Add new user" %}</a>
-  </div>
 </div>
 
 <div class="row">
   <div class="col">
-    <table class="table">
+    {% for u in users %}
-      <thead>
+      {{ u.email }}
-	<tr>
+      {{ u.is_admin }}
-	  <th scope="col">Email</th>
+    {% endfor %}
-	  <th>is Admin</th>
-	  <th></th>
-	  <th></th>
-	</tr>
-      </thead>
-      <tbody>
-	<tr>
-        {% for u in users %}
-          <td>{{ u.email }}</td>
-          <td>{{ u.is_admin }}</td>
-          <td><a href="{% url 'admin:edit_user' u.pk %}"><i class="bi bi-eye"></i></td>
-          <td><a href="{% url 'admin:delete_user' u.pk %}" class="text-danger" title="Remove"><i class="bi bi-trash"></i></td>
-	</tr>
-	{% endfor %}
-      </tbody>
-    </table>
   </div>
 </div>
 

admin/templates/delete_user.html

@@ -1,38 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-
-{% block content %}
-<div class="row">
-  <div class="col">
-    <h3>{{ subtitle }}</h3>
-  </div>
-</div>
-
-{% load django_bootstrap5 %}
-<div class="row mb-3">
-  <div class="col">
-    Are you sure than want remove the lot {{ object.name }} with {{ object.devices.count }} devices.
-  </div>
-</div>
-
-<form role="form" method="post">
-{% csrf_token %}
-{% if form.errors %}
-<div class="alert alert-danger alert-icon alert-icon-border alert-dismissible" role="alert">
-  <div class="icon"><span class="mdi mdi-close-circle-o"></span></div>
-  <div class="message">
-    {% for field, error in form.errors.items %}
-      {{ error }}<br />
-    {% endfor %}
-    <button class="btn-close" type="button" data-dismiss="alert" aria-label="Close"></button>
-  </div>
-</div>
-{% endif %}
-{% bootstrap_form form %}
-<div class="form-actions-no-box">
-  <a class="btn btn-grey" href="{% url 'admin:users' %}">{% translate "Cancel" %}</a>
-  <input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Delete' %}" />
-</div>
-
-</form>
-{% endblock %}

admin/templates/user.html

@@ -1,32 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-
-{% block content %}
-<div class="row">
-  <div class="col">
-    <h3>{{ subtitle }}</h3>
-  </div>
-</div>
-
-{% load django_bootstrap5 %}
-<form role="form" method="post">
-{% csrf_token %}
-{% if form.errors %}
-<div class="alert alert-danger alert-icon alert-icon-border alert-dismissible" role="alert">
-  <div class="icon"><span class="mdi mdi-close-circle-o"></span></div>
-  <div class="message">
-    {% for field, error in form.errors.items %}
-      {{ error }}<br />
-    {% endfor %}
-    <button class="btn-close" type="button" data-dismiss="alert" aria-label="Close"></button>
-  </div>
-</div>
-{% endif %}
-{% bootstrap_form form %}
-<div class="form-actions-no-box">
-  <a class="btn btn-grey" href="{% url 'admin:users' %}">{% translate "Cancel" %}</a>
-  <input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Save' %}" />
-</div>
-
-</form>
-{% endblock %}

admin/urls.py

@@ -6,7 +6,4 @@ app_name = 'admin'
 urlpatterns = [
     path("panel/", views.PanelView.as_view(), name="panel"),
     path("users/", views.UsersView.as_view(), name="users"),
-    path("users/new", views.CreateUserView.as_view(), name="new_user"),
-    path("users/edit/<int:pk>", views.EditUserView.as_view(), name="edit_user"),
-    path("users/delete/<int:pk>", views.DeleteUserView.as_view(), name="delete_user"),
 ]

admin/views.py

@@ -1,12 +1,5 @@
-from django.urls import reverse_lazy
-from django.shortcuts import get_object_or_404
 from django.utils.translation import gettext_lazy as _
 from django.views.generic.base import TemplateView
-from django.views.generic.edit import (
-    CreateView,
-    UpdateView,
-    DeleteView,
-)
 from dashboard.mixins import DashboardView
 from user.models import User
 
@@ -32,58 +25,3 @@ class UsersView(DashboardView, TemplateView):
             "users": User.objects.filter()
         })
         return context
-
-
-class CreateUserView(DashboardView, CreateView):
-    template_name = "user.html"
-    title = _("User")
-    breadcrumb = _("admin / User") + " /"
-    success_url = reverse_lazy('admin:users')
-    model = User
-    fields = (
-        "email",
-        "password",
-        "is_admin",
-    )
-
-    def form_valid(self, form):
-        form.instance.institution = self.request.user.institution
-        form.instance.set_password(form.instance.password)
-        response = super().form_valid(form)
-        return response
-
-
-class DeleteUserView(DashboardView, DeleteView):
-    template_name = "delete_user.html"
-    title = _("Delete user")
-    breadcrumb = "admin / Delete user"
-    success_url = reverse_lazy('admin:users')
-    model = User
-    fields = (
-        "email",
-        "password",
-        "is_admin",
-    )
-
-    def form_valid(self, form):
-        response = super().form_valid(form)
-        return response
-
-
-class EditUserView(DashboardView, UpdateView):
-    template_name = "user.html"
-    title = _("Edit user")
-    breadcrumb = "admin / Edit user"
-    success_url = reverse_lazy('admin:users')
-    model = User
-    fields = (
-        "email",
-        "is_admin",
-    )
-
-    def get_form_kwargs(self):
-        pk = self.kwargs.get('pk')
-        self.object = get_object_or_404(self.model, pk=pk)
-        #self.object.set_password(self.object.password)
-        kwargs = super().get_form_kwargs()
-        return kwargs

dashboard/views.py

@@ -13,7 +13,7 @@ class UnassignedDevicesView(InventaryMixin):
     breadcrumb = "Devices / Unassigned Devices"
 
     def get_devices(self, user, offset, limit):
-        return Device.get_unassigned(self.request.user.institution, offset, limit)
+        return Device.get_unassigned(self.request.user, offset, limit)
 
 
 class LotDashboardView(InventaryMixin, DetailsMixin):

evidence/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.0.6 on 2024-10-07 11:38
+# Generated by Django 5.0.6 on 2024-10-04 13:16
 
 import django.db.models.deletion
 from django.conf import settings
@@ -47,9 +47,7 @@ class Migration(migrations.Migration):
                 (
                     "user",
                     models.ForeignKey(
-                        blank=True,
+                        on_delete=django.db.models.deletion.CASCADE,
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
                         to=settings.AUTH_USER_MODEL,
                     ),
                 ),

evidence/models.py

@@ -16,7 +16,7 @@ class Annotation(models.Model):
     created = models.DateTimeField(auto_now_add=True)
     uuid = models.UUIDField()
     owner = models.ForeignKey(Institution, on_delete=models.CASCADE)
-    user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True)
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
     type =  models.SmallIntegerField(choices=Type)
     key = models.CharField(max_length=STR_EXTEND_SIZE)
     value = models.CharField(max_length=STR_EXTEND_SIZE)

reset.sh

@@ -1,5 +1,5 @@
 rm db/*
 python3 manage.py migrate
 python3 manage.py add_institution Pangea
-python3 manage.py add_user Pangea user@example.org 1234 True
+python3 manage.py add_user Pangea user@example.org 1234
 python3 manage.py up_snapshots example/snapshots/ user@example.org

user/management/commands/add_user.py

@@ -14,22 +14,19 @@ class Command(BaseCommand):
         parser.add_argument('institution', type=str, help='institution')
         parser.add_argument('email', type=str, help='email')
         parser.add_argument('password', type=str, help='password')
-        parser.add_argument('is_admin', nargs='?', default=False, type=str, help='is admin')
 
     def handle(self, *args, **kwargs):
         email = kwargs['email']
         password = kwargs['password']
-        is_admin = kwargs['is_admin']
         institution = Institution.objects.get(name=kwargs['institution'])
-        self.create_user(institution, email, password, is_admin)
+        self.create_user(institution, email, password)
         self.create_lot_tags()
 
-    def create_user(self, institution, email, password, is_admin):
+    def create_user(self, institution, email, password):
         self.u = User.objects.create(
             institution=institution,
             email=email,
-            password=password,
+            password=password
-            is_admin=is_admin,
         )
         self.u.set_password(password)
         self.u.save()