From 33c4aebfeca805fb3a0f0781cca9ab2b50cd7cf6 Mon Sep 17 00:00:00 2001 From: Thomas Stallinger Date: Wed, 5 Aug 2026 09:12:45 +0200 Subject: [PATCH] =?UTF-8?q?feat:=20organisations=C3=BCbergreifende=20Ger?= =?UTF-8?q?=C3=A4teverwaltung=20im=20Admin-Bereich?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit routers/admin_geraete.py mit echter Funktionalität: alle Geräte aller Organisationen auflisten, pro Gerät der Auftragskatalog (Wiederverwendung von auftragskatalog.html und der Logik aus routers/geraete.py, nur ohne Org-Besitz-Check - Admins dürfen jedes Gerät direkt per ID öffnen). Co-Authored-By: Claude Sonnet 5 --- routers/admin_geraete.py | 80 +++++++++++++++++++++++++++++- templates/admin/geraete_liste.html | 27 ++++++++++ 2 files changed, 105 insertions(+), 2 deletions(-) create mode 100644 templates/admin/geraete_liste.html diff --git a/routers/admin_geraete.py b/routers/admin_geraete.py index 922c51c..51a6a68 100644 --- a/routers/admin_geraete.py +++ b/routers/admin_geraete.py @@ -1,14 +1,90 @@ -from fastapi import APIRouter, Depends, Request +from fastapi import APIRouter, Depends, HTTPException, Request +from fastapi.responses import RedirectResponse +from anode_client import anode_request from auth import require_admin +from routers.geraete import OPTIONEN_FELDER, gruppiere_nach_kategorie from templating import templates router = APIRouter(prefix="/admin/geraete") +def find_device(device_id: str) -> dict | None: + result = anode_request("GET", "/api/v1/devices") + devices = result.get("devices", []) if result.get("success") else [] + + for device in devices: + if device["id"] == device_id: + return device + + return None + + @router.get("") def index(request: Request, user: dict = Depends(require_admin)): + result = anode_request("GET", "/api/v1/devices") + devices = result.get("devices", []) if result.get("success") else [] + return templates.TemplateResponse( - request, "admin/platzhalter.html", {"user": user, "titel": "Geräte"} + request, "admin/geraete_liste.html", {"user": user, "devices": devices} ) + + +@router.get("/{device_id}") +def auftragskatalog_ansicht(request: Request, device_id: str, user: dict = Depends(require_admin)): + device = find_device(device_id) + + if device is None: + raise HTTPException(status_code=404, detail="Gerät wurde nicht gefunden.") + + result = anode_request("GET", f"/api/v1/devices/{device_id}/auftragskatalog") + katalog = result.get("auftragskatalog", []) if result.get("success") else [] + fehler = None if result.get("success") else result.get("message") + + return templates.TemplateResponse( + request, + "auftragskatalog.html", + { + "user": user, + "device": device, + "kategorien": gruppiere_nach_kategorie(katalog), + "fehler": fehler, + "optionen_felder": OPTIONEN_FELDER, + "zurueck_url": "/admin/geraete", + }, + ) + + +@router.post("/{device_id}/auftragskatalog/{merkmal_key}/select") +async def auftrag_select( + request: Request, device_id: str, merkmal_key: str, user: dict = Depends(require_admin) +): + if find_device(device_id) is None: + raise HTTPException(status_code=404, detail="Gerät wurde nicht gefunden.") + + form = await request.form() + optionen = { + feld["key"]: (form.get(f"optionen.{feld['key']}") == "on") + for feld in OPTIONEN_FELDER.get(merkmal_key, []) + } + + anode_request( + "POST", + f"/api/v1/devices/{device_id}/auftragskatalog/{merkmal_key}/select", + json={"optionen": optionen}, + ) + + return RedirectResponse(f"/admin/geraete/{device_id}", status_code=303) + + +@router.post("/{device_id}/auftragskatalog/{merkmal_key}/deselect") +def auftrag_deselect(device_id: str, merkmal_key: str, user: dict = Depends(require_admin)): + if find_device(device_id) is None: + raise HTTPException(status_code=404, detail="Gerät wurde nicht gefunden.") + + anode_request( + "POST", f"/api/v1/devices/{device_id}/auftragskatalog/{merkmal_key}/deselect" + ) + + return RedirectResponse(f"/admin/geraete/{device_id}", status_code=303) diff --git a/templates/admin/geraete_liste.html b/templates/admin/geraete_liste.html new file mode 100644 index 0000000..ba7661d --- /dev/null +++ b/templates/admin/geraete_liste.html @@ -0,0 +1,27 @@ +{% extends "admin/layout.html" %} +{% block title %}Geräte — Tuxflotte Admin{% endblock %} +{% block admin_content %} +

Alle Geräte

+{% if not devices %} +

Keine Geräte gefunden.

+{% else %} +
+ + + + + + {% for device in devices %} + + + + + + + + {% endfor %} + +
OrganisationHostnameKennungLetzter Check-in
{{ device.organization_name }}{{ device.hostname or "—" }}{{ device.device_fingerprint }}{{ device.agent_last_checkin or "noch nie" }}Auftragskatalog →
+
+{% endif %} +{% endblock %}