rmanach/mumui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change deployment url to /deployments

Browse Source
This commit is contained in:
rmanach 2023-09-26 13:58:14 +02:00
parent 2b392d76d4
commit a62be9b5e7
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/urls.py
View File

@ -4,7 +4,7 @@ from django.urls import path, include
from deployment.views import index, create, details, deploy, abort from deployment.views import index, create, details, deploy, abort
urlpatterns = [ urlpatterns = [
path("", index, name="deployment"), path("", index, name="deployments"),
path("create", create, name="deployment-create"), path("create", create, name="deployment-create"),
path("<uuid:deployment_id>", details, name="deployment-details"), path("<uuid:deployment_id>", details, name="deployment-details"),
path("<uuid:deployment_id>/deploy", deploy, name="deployment-launch"), path("<uuid:deployment_id>/deploy", deploy, name="deployment-launch"),
@ -13,7 +13,7 @@ urlpatterns = [
"events/<user_id>/", "events/<user_id>/",
include(django_eventstream.urls), include(django_eventstream.urls),
{"format-channels": ["deployment_{user_id}"]}, {"format-channels": ["deployment_{user_id}"]},
name="deployment-events", name="deployments-events",
), ),
path( path(
"events/<user_id>/<deployment_id>/", "events/<user_id>/<deployment_id>/",

10
deployment/views.py
View File

@ -71,9 +71,9 @@ def deploy(request, deployment_id):
launch_deploy.delay(deployment_id) launch_deploy.delay(deployment_id)
if page := request.GET.get("page", ""): 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): def abort(request, deployment_id):
@ -95,7 +95,7 @@ def abort(request, deployment_id):
Event.send_details(deployment, progress) Event.send_details(deployment, progress)
Event.send(deployment) Event.send(deployment)
return HttpResponseRedirect(f"/deployment/{deployment.id}") return HttpResponseRedirect(f"/deployments/{deployment.id}")
def details(request, deployment_id): def details(request, deployment_id):
@ -116,7 +116,7 @@ def details(request, deployment_id):
deployment.delete() deployment.delete()
except Exception as e: except Exception as e:
return HttpResponseServerError(e) return HttpResponseServerError(e)
return HttpResponseRedirect("/deployment") return HttpResponseRedirect("/deployments")
return render( return render(
request, request,
@ -145,4 +145,4 @@ def create(request):
except Exception as e: except Exception as e:
return HttpResponseServerError(e) return HttpResponseServerError(e)
return HttpResponseRedirect("/deployment") return HttpResponseRedirect("/deployments")

2
mumui/urls.py
View File

@ -21,6 +21,6 @@ from django.views.generic.base import TemplateView
urlpatterns = [ urlpatterns = [
path("admin/", admin.site.urls), path("admin/", admin.site.urls),
path("accounts/", include("django.contrib.auth.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"), path("", TemplateView.as_view(template_name="home.html"), name="home"),
] ]

2
templates/deployment/details.html
View File

@ -92,7 +92,7 @@
{% endif %} {% endif %}
<script> <script>
function goBack() { function goBack() {
window.location={% url 'deployment' %}; window.location={% url 'deployments' %};
} }
</script> </script>
{% endblock %} {% endblock %}

2
templates/header.html
View File

@ -15,7 +15,7 @@
<a class="nav-link" href="/">Home</a> <a class="nav-link" href="/">Home</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{% url 'deployment' %}" class="nav-link">Deployments</a></li> <a href="{% url 'deployments' %}" class="nav-link">Deployments</a></li>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="#">About</a></li> <a class="nav-link" href="#">About</a></li>

2
templates/home.html
View File

@ -13,7 +13,7 @@
<div class="row justify-content-md-center"> <div class="row justify-content-md-center">
<div class="col-lg-6 col-md-8 col-sm-8"> <div class="col-lg-6 col-md-8 col-sm-8">
<div style="text-align: center;">Forget, i don't care... Please go on <div style="text-align: center;">Forget, i don't care... Please go on
<a href="{% url 'deployment' %}">Deployments</a> <a href="{% url 'deployments' %}">Deployments</a>
and enjoy the life ! and enjoy the life !
</div> </div>
</div> </div>