From a62be9b5e72bc87b58651d138be4653cef187012 Mon Sep 17 00:00:00 2001 From: rmanach Date: Tue, 26 Sep 2023 13:58:14 +0200 Subject: [PATCH] change deployment url to /deployments --- deployment/urls.py | 4 ++-- deployment/views.py | 10 +++++----- mumui/urls.py | 2 +- templates/deployment/details.html | 2 +- templates/header.html | 2 +- templates/home.html | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/deployment/urls.py b/deployment/urls.py index 8d73b6e..b450961 100644 --- a/deployment/urls.py +++ b/deployment/urls.py @@ -4,7 +4,7 @@ from django.urls import path, include from deployment.views import index, create, details, deploy, abort urlpatterns = [ - path("", index, name="deployment"), + path("", index, name="deployments"), path("create", create, name="deployment-create"), path("", details, name="deployment-details"), path("/deploy", deploy, name="deployment-launch"), @@ -13,7 +13,7 @@ urlpatterns = [ "events//", include(django_eventstream.urls), {"format-channels": ["deployment_{user_id}"]}, - name="deployment-events", + name="deployments-events", ), path( "events///", diff --git a/deployment/views.py b/deployment/views.py index efda3c4..c0c3fc8 100644 --- a/deployment/views.py +++ b/deployment/views.py @@ -71,9 +71,9 @@ def deploy(request, deployment_id): launch_deploy.delay(deployment_id) if page := request.GET.get("page", ""): - return HttpResponseRedirect(f"/deployment?page={page}") + return HttpResponseRedirect(f"/deployments?page={page}") - return HttpResponseRedirect("/deployment") + return HttpResponseRedirect("/deployments") def abort(request, deployment_id): @@ -95,7 +95,7 @@ def abort(request, deployment_id): Event.send_details(deployment, progress) Event.send(deployment) - return HttpResponseRedirect(f"/deployment/{deployment.id}") + return HttpResponseRedirect(f"/deployments/{deployment.id}") def details(request, deployment_id): @@ -116,7 +116,7 @@ def details(request, deployment_id): deployment.delete() except Exception as e: return HttpResponseServerError(e) - return HttpResponseRedirect("/deployment") + return HttpResponseRedirect("/deployments") return render( request, @@ -145,4 +145,4 @@ def create(request): except Exception as e: return HttpResponseServerError(e) - return HttpResponseRedirect("/deployment") + return HttpResponseRedirect("/deployments") diff --git a/mumui/urls.py b/mumui/urls.py index 13f72b2..95eedfb 100644 --- a/mumui/urls.py +++ b/mumui/urls.py @@ -21,6 +21,6 @@ from django.views.generic.base import TemplateView urlpatterns = [ path("admin/", admin.site.urls), path("accounts/", include("django.contrib.auth.urls")), - path("deployment/", include("deployment.urls")), + path("deployments/", include("deployment.urls")), path("", TemplateView.as_view(template_name="home.html"), name="home"), ] diff --git a/templates/deployment/details.html b/templates/deployment/details.html index 4ae7eb3..bd741d7 100644 --- a/templates/deployment/details.html +++ b/templates/deployment/details.html @@ -92,7 +92,7 @@ {% endif %} {% endblock %} \ No newline at end of file diff --git a/templates/header.html b/templates/header.html index 51ec8ab..a7cce82 100644 --- a/templates/header.html +++ b/templates/header.html @@ -15,7 +15,7 @@ Home + Deployments diff --git a/templates/home.html b/templates/home.html index 7b22bc9..daddec0 100644 --- a/templates/home.html +++ b/templates/home.html @@ -13,7 +13,7 @@
Forget, i don't care... Please go on - Deployments + Deployments and enjoy the life !