From c8e06fe1e8439663b0b7c6005c12444e68dd4e5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80?= <78488229+viktor138irk@users.noreply.github.com> Date: Wed, 6 May 2026 21:10:27 +0900 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BC=D0=B0=D1=80=D1=88=D1=80=D1=83=D1=82=20?= =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B2=D0=B8?= =?UTF-8?q?=D1=80=D1=82=D1=83=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B9=20=D0=BC?= =?UTF-8?q?=D0=B0=D1=88=D0=B8=D0=BD=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/app.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/web/app.py b/web/app.py index d9f4e41..33ffd91 100644 --- a/web/app.py +++ b/web/app.py @@ -216,16 +216,8 @@ def dashboard(request: Request): return templates.TemplateResponse("dashboard.html", {"request": request, "app_name": APP_NAME, "system": system_summary(), "services": services, "vms": vms, "pools": pools, "network": network_summary(), "user": AUTH_USER}) -@app.get("/vm/{name}", response_class=HTMLResponse) -def vm_detail_page(request: Request, name: str): - auth_redirect = require_auth(request) - if auth_redirect: - return auth_redirect - if not valid_vm_name(name) or not vm_exists(name): - return RedirectResponse(url="/", status_code=303) - return templates.TemplateResponse("vm_detail.html", {"request": request, "app_name": APP_NAME, "user": AUTH_USER, "vm": vm_details(name), "host_ip": system_summary()["ip"]}) - - +# Важно: статический маршрут /vm/create должен быть выше динамического /vm/{name}. +# Иначе FastAPI воспринимает слово "create" как имя виртуальной машины. @app.get("/vm/create", response_class=HTMLResponse) def vm_create_page(request: Request): auth_redirect = require_auth(request) @@ -272,6 +264,16 @@ def vm_create_submit(request: Request, name: str = Form(...), memory: int = Form return RedirectResponse(url="/", status_code=303) +@app.get("/vm/{name}", response_class=HTMLResponse) +def vm_detail_page(request: Request, name: str): + auth_redirect = require_auth(request) + if auth_redirect: + return auth_redirect + if not valid_vm_name(name) or not vm_exists(name): + return RedirectResponse(url="/", status_code=303) + return templates.TemplateResponse("vm_detail.html", {"request": request, "app_name": APP_NAME, "user": AUTH_USER, "vm": vm_details(name), "host_ip": system_summary()["ip"]}) + + @app.post("/vm/{name}/{action}") def vm_action(request: Request, name: str, action: str): auth_redirect = require_auth(request)