aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorParker Berberian <pberberian@iol.unh.edu>2019-03-15 10:59:36 -0400
committerParker Berberian <pberberian@iol.unh.edu>2019-03-15 10:59:36 -0400
commit9cb0a4691e9e4bd30a0f68861942ac987b767bf1 (patch)
treeaf8a29889fd75fa0fb574bb8d5e4458ce494ecdd
parent6c2668096099f184a6d805de433e0dec3d8b86d0 (diff)
Minor Cleanup enhancements
Change-Id: I032c8771b69e0f6d320759ee95c4987e41df57ba Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
-rw-r--r--src/booking/quick_deployer.py2
-rw-r--r--src/booking/views.py3
-rw-r--r--src/templates/config_bundle/steps/config_software.html36
3 files changed, 21 insertions, 20 deletions
diff --git a/src/booking/quick_deployer.py b/src/booking/quick_deployer.py
index 8a81d18..f076a2e 100644
--- a/src/booking/quick_deployer.py
+++ b/src/booking/quick_deployer.py
@@ -117,7 +117,7 @@ def check_available_matching_host(lab, hostprofile):
available_host_types = ResourceManager.getInstance().getAvailableHostTypes(lab)
if hostprofile not in available_host_types:
# TODO: handle deleting generic resource in this instance along with grb
- raise HostNotAvailable("Could not book selected host due to changed availability. Try again later")
+ raise HostNotAvailable('Requested host type is not available. Please try again later. Host availability can be viewed in the "Hosts" tab to the left.')
hostset = Host.objects.filter(lab=lab, profile=hostprofile).filter(booked=False).filter(working=True)
if not hostset.exists():
diff --git a/src/booking/views.py b/src/booking/views.py
index 1e14b8e..8211a0c 100644
--- a/src/booking/views.py
+++ b/src/booking/views.py
@@ -62,8 +62,7 @@ def quick_create(request):
try:
create_from_form(form, request)
except Exception as e:
- messages.error(request, "Whoops, looks like an error occurred. "
- "Let the admins know that you got the following message: " + str(e))
+ messages.error(request, "Whoops, an error occurred: " + str(e))
return render(request, 'workflow/exit_redirect.html', context)
messages.success(request, "We've processed your request. "
diff --git a/src/templates/config_bundle/steps/config_software.html b/src/templates/config_bundle/steps/config_software.html
index ca15c77..e1f9541 100644
--- a/src/templates/config_bundle/steps/config_software.html
+++ b/src/templates/config_bundle/steps/config_software.html
@@ -12,23 +12,25 @@
<p>And a description:</p>
{{ form.description }}
- <p>Install OPNFV?</p>
- {{ form.opnfv }}
- <p>Choose your:</p>
- <table>
- <thead>
- <tr>
- <th>Installer</th>
- <th>Scenario</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>{{form.installer}}</td>
- <td>{{form.scenario}}</td>
- </tr>
- </tbody>
- </table>
+ <div id="hidden" style="display:none;">
+ <p>Install OPNFV?</p>
+ {{ form.opnfv }}
+ <p>Choose your:</p>
+ <table>
+ <thead>
+ <tr>
+ <th>Installer</th>
+ <th>Scenario</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>{{form.installer}}</td>
+ <td>{{form.scenario}}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</form>