diff options
| -rw-r--r-- | dashboard/src/booking/quick_deployer.py | 2 | ||||
| -rw-r--r-- | dashboard/src/booking/views.py | 3 | ||||
| -rw-r--r-- | dashboard/src/templates/config_bundle/steps/config_software.html | 36 |
3 files changed, 21 insertions, 20 deletions
diff --git a/dashboard/src/booking/quick_deployer.py b/dashboard/src/booking/quick_deployer.py index 8a81d18..f076a2e 100644 --- a/dashboard/src/booking/quick_deployer.py +++ b/dashboard/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/dashboard/src/booking/views.py b/dashboard/src/booking/views.py index 1e14b8e..8211a0c 100644 --- a/dashboard/src/booking/views.py +++ b/dashboard/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/dashboard/src/templates/config_bundle/steps/config_software.html b/dashboard/src/templates/config_bundle/steps/config_software.html index ca15c77..e1f9541 100644 --- a/dashboard/src/templates/config_bundle/steps/config_software.html +++ b/dashboard/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> |