From 217e271cd49649357c18ca3803107698a9245f6e Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Wed, 5 Feb 2025 16:49:59 -0300 Subject: [PATCH] Improved multiple backup js --- router_manager/views.py | 5 +- routerfleet/settings.py | 2 +- templates/router_manager/router_list.html | 141 +++++++++++++--------- 3 files changed, 84 insertions(+), 64 deletions(-) diff --git a/router_manager/views.py b/router_manager/views.py index 5b3355f..178f31e 100644 --- a/router_manager/views.py +++ b/router_manager/views.py @@ -258,10 +258,7 @@ def view_create_instant_backup_multiple_routers(request): for uuid in uuids: router = get_object_or_404(Router, uuid=uuid) error = create_instant_backup(router) - if error: - results.append({'router': router.name, 'status': error}) - else: - results.append({'router': router.name, 'status': 'backup started'}) + results.append({'router': router.name, 'status': error}) return JsonResponse({'results': results}) diff --git a/routerfleet/settings.py b/routerfleet/settings.py index a4c94ae..9b19562 100644 --- a/routerfleet/settings.py +++ b/routerfleet/settings.py @@ -142,6 +142,6 @@ STATICFILES_DIRS = [ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' MEDIA_ROOT = '/var/lib/routerfleet/' -ROUTERFLEET_VERSION = 7023 +ROUTERFLEET_VERSION = 7501 from routerfleet.production_settings import * diff --git a/templates/router_manager/router_list.html b/templates/router_manager/router_list.html index 849d941..de89fbb 100644 --- a/templates/router_manager/router_list.html +++ b/templates/router_manager/router_list.html @@ -74,17 +74,14 @@ {% endfor %} -
-
- Add Router - Import Tool - - - -
+ Add Router + Import Tool + + +
@@ -159,58 +156,84 @@ checkStatusChange(); }); - + + {% endblock %} \ No newline at end of file