From b63c629c125ed2c24d862ca3963c987e97123d07 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 9 Sep 2013 11:10:37 +0200
Subject: [PATCH] renamed slice-request templates more consistently
---
portal/slicerequestview.py | 6 +++---
.../{slicereq_recvd.html => slice-request-ack-view.html} | 0
.../{slice_request_email.txt => slice-request-email.txt} | 0
.../{slice_request.html => slice-request-view.html} | 0
portal/util.py | 2 +-
5 files changed, 4 insertions(+), 4 deletions(-)
rename portal/templates/{slicereq_recvd.html => slice-request-ack-view.html} (100%)
rename portal/templates/{slice_request_email.txt => slice-request-email.txt} (100%)
rename portal/templates/{slice_request.html => slice-request-view.html} (100%)
diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index 4f332e4a..85faad8d 100644
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -54,10 +54,10 @@ class SliceRequestView (LoginRequiredAutoLogoutView):
#recipients = ['yasin.upmc@gmail.com','jordan.auge@lip6.fr']
if cc_myself:
recipients.append(email)
- msg = render_to_string('slice_request_email.txt', form.cleaned_data)
+ msg = render_to_string('slice-request-email.txt', form.cleaned_data)
send_mail("Onelab New Slice request form submitted", msg, email, recipients)
- return render(request,'slicereq_recvd.html') # Redirect after POST
+ return render(request,'slice-request-ack-view.html') # Redirect after POST
else:
return self._display (request, form)
@@ -65,7 +65,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView):
return self._display (request, SliceRequestForm(initial=self.authority_hrn_initial(request)))
def _display (self, request, form):
- return render(request, 'slice_request.html', {
+ return render(request, 'slice-request-view.html', {
'form': form,
'topmenu_items': topmenu_items('Request a slice', request),
'username': the_user (request)
diff --git a/portal/templates/slicereq_recvd.html b/portal/templates/slice-request-ack-view.html
similarity index 100%
rename from portal/templates/slicereq_recvd.html
rename to portal/templates/slice-request-ack-view.html
diff --git a/portal/templates/slice_request_email.txt b/portal/templates/slice-request-email.txt
similarity index 100%
rename from portal/templates/slice_request_email.txt
rename to portal/templates/slice-request-email.txt
diff --git a/portal/templates/slice_request.html b/portal/templates/slice-request-view.html
similarity index 100%
rename from portal/templates/slice_request.html
rename to portal/templates/slice-request-view.html
diff --git a/portal/util.py b/portal/util.py
index df3606cb..918f16c6 100644
--- a/portal/util.py
+++ b/portal/util.py
@@ -169,7 +169,7 @@ def slice_request(request):
slice_name = form.cleaned_data['slice_name']
else:
form = SliceRequestForm()
- return render(request, 'slice_request.html', locals())
+ return render(request, 'slice-request-view.html', locals())
def slice_validate(request):
pass
--
2.47.0