X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Ftemplates%2Fadmin%2Flogin.html;h=29534db54089f86b704c4f48ee6d1b99076a7c8a;hb=ed260c2012c507198ec2007ffc90aa962e2806ca;hp=a1657073094dca4bde8306b1883190e7a59f3182;hpb=c3439c3b5bf57e550115a6c2bf5be60d841585b4;p=plstackapi.git

diff --git a/planetstack/templates/admin/login.html b/planetstack/templates/admin/login.html
index a165707..29534db 100644
--- a/planetstack/templates/admin/login.html
+++ b/planetstack/templates/admin/login.html
@@ -25,7 +25,12 @@
 {% endif %}
 
 {% if form.non_field_errors or form.this_is_the_login_form.errors %}
-{% for error in form.non_field_errors|add:form.this_is_the_login_form.errors %}
+{% for error in form.non_field_errors %}
+<p class="errornote">
+    {{ error }}
+</p>
+{% endfor %}
+{% for error in form.this_is_the_login_form.errors %}
 <p class="errornote">
     {{ error }}
 </p>
@@ -126,9 +131,21 @@ $("#request-signup").unbind().click(function(){
 								},
 								async: false,
 								type: 'POST',
-								success: function () {
-									$("#request-account-form").dialog("close");	
-									alert("Your request has been submitted");							
+								success: function (response) {
+                                                                    if (response && response.error) {
+                                                                        if (response.error == "already_approved") {
+                                                                            alert("Your request has already been proccessed and approved. We are sending you another email with a new temporary password");
+                                                                            return;
+                                                                        } 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");
 								},
 								error:function (xhr, textStatus, thrownError){
          							   alert("Error:", textStatus + " " + xhr.responseText);