From ed260c2012c507198ec2007ffc90aa962e2806ca Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Wed, 28 Jan 2015 16:11:35 -0800 Subject: [PATCH] return an error when trying to register a deleted user --- planetstack/core/dashboard/views/tenant.py | 4 ++++ planetstack/templates/admin/login.html | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/planetstack/core/dashboard/views/tenant.py b/planetstack/core/dashboard/views/tenant.py index a64250f..7794bf2 100644 --- a/planetstack/core/dashboard/views/tenant.py +++ b/planetstack/core/dashboard/views/tenant.py @@ -26,6 +26,10 @@ class RequestAccessView(View): else: return HttpResponse(json.dumps({"error": "already_pending"}), content_type='application/javascript') + user=User.deleted_objects.filter(email=BaseUserManager.normalize_email(email)) + if (user): + return HttpResponse(json.dumps({"error": "is_deleted"}), content_type='application/javascript') + user = User( email=BaseUserManager.normalize_email(email), firstname=firstname, diff --git a/planetstack/templates/admin/login.html b/planetstack/templates/admin/login.html index 37f1055..29534db 100644 --- a/planetstack/templates/admin/login.html +++ b/planetstack/templates/admin/login.html @@ -139,10 +139,13 @@ $("#request-signup").unbind().click(function(){ } else if (response.error == "already_pending") { alert("Your request is already pending and awaiting approval"); return; + } else if (response.error == "is_deleted") { + alert("Your user record is in a deleted state. Please contact OpenCloud support"); + return; } } - $("#request-account-form").dialog("close"); - alert("Your request has been submitted"); + $("#request-account-form").dialog("close"); + alert("Your request has been submitted"); }, error:function (xhr, textStatus, thrownError){ alert("Error:", textStatus + " " + xhr.responseText); -- 2.43.0