return an error when trying to register a deleted user
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 @@
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 @@
} 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);