diff --git a/app/routers/servers.py b/app/routers/servers.py index 97adacf..2c4fbb5 100644 --- a/app/routers/servers.py +++ b/app/routers/servers.py @@ -65,12 +65,15 @@ async def servers_export_csv(request: Request, db=Depends(get_db), domain: str = Query(None), env: str = Query(None), tier: str = Query(None), etat: str = Query(None), os: str = Query(None), owner: str = Query(None), + zone: str = Query(None), licence: str = Query(None), search: str = Query(None)): user = get_current_user(request) if not user: return RedirectResponse(url="/login") import io, csv - filters = {"domain": domain, "env": env, "tier": tier, "etat": etat, "os": os, "owner": owner, "search": search} + filters = {"domain": domain, "env": env, "tier": tier, "etat": etat, + "os": os, "owner": owner, "zone": zone, "licence": licence, + "search": search} servers, total = list_servers(db, filters, page=1, per_page=99999, sort="hostname", sort_dir="asc") output = io.StringIO() w = csv.writer(output, delimiter=";") diff --git a/app/templates/servers.html b/app/templates/servers.html index 6bfba3b..29f0faf 100644 --- a/app/templates/servers.html +++ b/app/templates/servers.html @@ -2,7 +2,7 @@ {% block title %}Serveurs{% endblock %} {% macro sort_url(col) -%} -?sort={{ col }}&sort_dir={% if sort == col and sort_dir == 'asc' %}desc{% else %}asc{% endif %}&search={{ filters.search or '' }}&domain={{ filters.domain or '' }}&env={{ filters.env or '' }}&tier={{ filters.tier or '' }}&etat={{ filters.etat or '' }}&os={{ filters.os or '' }}&owner={{ filters.owner or '' }}&page=1 +?sort={{ col }}&sort_dir={% if sort == col and sort_dir == 'asc' %}desc{% else %}asc{% endif %}&search={{ filters.search or '' }}&domain={{ filters.domain or '' }}&env={{ filters.env or '' }}&tier={{ filters.tier or '' }}&etat={{ filters.etat or '' }}&os={{ filters.os or '' }}&owner={{ filters.owner or '' }}&zone={{ filters.zone or '' }}&licence={{ filters.licence or '' }}&page=1 {%- endmacro %} {% macro sort_icon(col) -%} @@ -10,14 +10,14 @@ {%- endmacro %} {% macro qs(p) -%} -?page={{ p }}&search={{ filters.search or '' }}&domain={{ filters.domain or '' }}&env={{ filters.env or '' }}&tier={{ filters.tier or '' }}&etat={{ filters.etat or '' }}&os={{ filters.os or '' }}&owner={{ filters.owner or '' }}&sort={{ sort }}&sort_dir={{ sort_dir }} +?page={{ p }}&search={{ filters.search or '' }}&domain={{ filters.domain or '' }}&env={{ filters.env or '' }}&tier={{ filters.tier or '' }}&etat={{ filters.etat or '' }}&os={{ filters.os or '' }}&owner={{ filters.owner or '' }}&zone={{ filters.zone or '' }}&licence={{ filters.licence or '' }}&sort={{ sort }}&sort_dir={{ sort_dir }} {%- endmacro %} {% block content %}