diff options
author | Parker Berberian <pberberian@iol.unh.edu> | 2019-01-03 16:09:13 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2019-01-03 16:09:13 +0000 |
commit | 51aa0589e290e9cfc29cf013909b84298c0b7af3 (patch) | |
tree | 509ecaaf80dc6ec7d906b10d96f9f705f6d85d81 /dashboard/src/workflow/views.py | |
parent | 4482bfa78a65e0711aff6d3e9937ca415dc9dbd0 (diff) | |
parent | 4df434cdfb42b7afac3f8a4781c4aa0a3005d092 (diff) |
Merge "Implement Segmented Workflows"
Diffstat (limited to 'dashboard/src/workflow/views.py')
-rw-r--r-- | dashboard/src/workflow/views.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/dashboard/src/workflow/views.py b/dashboard/src/workflow/views.py index e5ef5c6..6d59b1c 100644 --- a/dashboard/src/workflow/views.py +++ b/dashboard/src/workflow/views.py @@ -30,6 +30,17 @@ def attempt_auth(request): def delete_session(request): + manager = attempt_auth(request) + + if not manager: + return HttpResponseGone("No session found that relates to current request") + + if manager.pop_workflow(): + return HttpResponse('') + else: + del ManagerTracker.managers[request.session['manager_session']] + return render(request, 'workflow/exit_redirect.html') + try: del ManagerTracker.managers[request.session['manager_session']] return HttpResponse('') @@ -70,7 +81,8 @@ def manager_view(request): logger.debug("edit found") manager.add_workflow(workflow_type=request.POST.get('edit'), edit_object=int(request.POST.get('edit_id'))) elif request.POST.get('cancel') is not None: - del ManagerTracker.managers[request.session['manager_session']] + if not manager.pop_workflow(): + del ManagerTracker.managers[request.session['manager_session']] return manager.status(request) |