From 81638e737ebf249ca9a6830ad6ca499915cb52ef Mon Sep 17 00:00:00 2001
From: Yasin Rahman <loic.baron@lip6.fr>
Date: Mon, 18 May 2015 12:02:59 +0200
Subject: [PATCH] FIX: pending_authority validation error and add authority
 password length

---
 portal/actions.py               | 13 +++++++------
 portal/templates/join_view.html |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/portal/actions.py b/portal/actions.py
index 4dda3708..0375874e 100644
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -677,13 +677,14 @@ def portal_validate_request(wsgi_request, request_ids):
                 a = PendingAuthority.objects.get(id=request['id'])
                 ctx = { 
                     'site_name'     : a.site_name,
-                    'short_name'    : a.short_name,
-                    'url'           : a.url,
-                    'city'          : a.city,
-                    'country'       : a.country,                          
-                    'portal_url'    : a.current_site,
+                    #'short_name'    : a.short_name,
+                    #'url'           : a.url,
+                    'city'          : a.address_city,
+                    'country'       : a.address_country,                          
+                    #'portal_url'    : a.current_site,
                 }
-                user_email = a.email
+                # address_line1 contains the email of the user in pending_authority table
+                user_email = a.address_line1
 
                 PendingAuthority.objects.get(id=request['id']).delete()
                 
diff --git a/portal/templates/join_view.html b/portal/templates/join_view.html
index 89d06baf..ff9dad42 100644
--- a/portal/templates/join_view.html
+++ b/portal/templates/join_view.html
@@ -100,10 +100,10 @@
 		style="width:200px" placeholder="Phone number"  maxlength="20" class="form-control" required>
     </div>
 	<div class="form-group">
-  		<input type="password"  id="password" name="pi_password"   class="form-control" style="width:200px" minlength="4" value="{{ password }}" placeholder="Password" required/>
+  		<input type="password"  id="password" name="pi_password"   class="form-control" style="width:200px" minlength="8" value="{{ password }}" placeholder="Password" required/>
 	</div>
 	<div class="form-group">
-    	<input type="password"  id="confirmpassword" name="confirmpassword" style="width:200px"  minlength="4" class="form-control" value="" placeholder="Confirm Password" required/>
+    	<input type="password"  id="confirmpassword" name="confirmpassword" style="width:200px"  minlength="8" class="form-control" value="" placeholder="Confirm Password" required/>
 	</div>
 
 	</div>
-- 
2.43.0