Merge branch 'master' of ssh://git.onelab.eu/git/myslice

diff --git a/portal/actions.py b/portal/actions.py
index a6349c7..629dd7c 100644 (file)
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -1,7 +1,7 @@
 from django.http                 import HttpResponse
 from manifold.core.query         import Query
 from manifold.manifoldapi        import execute_query,execute_admin_query
-from portal.models               import PendingUser, PendingSlice
+from portal.models               import PendingUser, PendingSlice, PendingAuthority
 import json
 
 # Thierry: moving this right into the code so 
@@ -146,19 +146,39 @@ def make_request_slice(slice):
     request['purpose'] = slice.purpose
     return request
 
-def make_requests(pending_users, pending_slices):
-    print "pending users =", pending_users
-    print "pending slices =", pending_slices
+def make_request_authority(authority):
+    request = {}
+    request['type']                  = 'authority'
+    request['id']                    = authority.id
+    request['site_name']             = authority.site_name
+    request['site_latitude']         = authority.site_latitude
+    request['site_longitude']        = authority.site_longitude
+    request['site_url']              = authority.site_url
+    request['site_authority']        = authority.site_authority
+    request['site_abbreviated_name'] = authority.site_abbreviated_name
+    request['address_line1']         = authority.address_line1
+    request['address_line2']         = authority.address_line2
+    request['address_line3']         = authority.address_line3
+    request['address_city']          = authority.address_city
+    request['address_postalcode']    = authority.address_postalcode
+    request['address_state']         = authority.address_state
+    request['address_country']       = authority.address_country
+    request['authority_hrn']         = authority.authority_hrn
+    request['timestamp']             = authority.created
+    return request
 
+def make_requests(pending_users, pending_slices, pending_authorities):
     requests = []
     for user in pending_users:
         requests.append(make_request_user(user))
     for slice in pending_slices:
         requests.append(make_request_slice(slice))
+    for authority in pending_authorities:
+        requests.append(make_request_authority(authority))
     return requests   
 
 def get_request_by_id(ids):
-    sorted_ids = { 'user': [], 'slice': [] }
+    sorted_ids = { 'user': [], 'slice': [], 'authority': [] }
     for type__id in ids:
         type, id = type__id.split('__')
         sorted_ids[type].append(id)
@@ -166,22 +186,26 @@ def get_request_by_id(ids):
     if not ids:
         pending_users  = PendingUser.objects.all()
         pending_slices = PendingSlice.objects.all()
+        pending_authorities = PendingAuthority.objects.all()
     else:
         pending_users  = PendingUser.objects.filter(id__in=sorted_ids['user']).all()
         pending_slices = PendingSlice.objects.filter(id__in=sorted_ids['slice']).all()
+        pending_authorities = PendingAuthority.objects.filter(id__in=sorted_ids['authority']).all()
 
-    return make_requests(pending_users, pending_slices)
+    return make_requests(pending_users, pending_slices, pending_authorities)
 
 def get_request_by_authority(authority_hrns):
     print "get_request_by_authority auth_hrns = ", authority_hrns
     if not authority_hrns:
         pending_users  = PendingUser.objects.all()
         pending_slices = PendingSlice.objects.all()
+        pending_authorities = PendingAuthority.objects.all()
     else:
         pending_users  = PendingUser.objects.filter(authority_hrn__in=authority_hrns).all()
         pending_slices = PendingSlice.objects.filter(authority_hrn__in=authority_hrns).all()
+        pending_authorities = PendingAuthority.objects.filter(authority_hrn__in=authority_hrns).all()
 
-    return make_requests(pending_users, pending_slices)
+    return make_requests(pending_users, pending_slices, pending_authorities)
     
 # XXX Is it in sync with the form fields ?
 

diff --git a/portal/joinview.py b/portal/joinview.py
index 5c93d42..42f7ac5 100644 (file)
--- a/portal/joinview.py
+++ b/portal/joinview.py
@@ -132,6 +132,7 @@ class JoinView (FreeAccessView):
                     address_postalcode    = reg_address_postalcode,
                     address_state         = reg_address_state,
                     address_country       = reg_address_country,
+                    authority_hrn         = reg_root_authority_hrn,
                 )
                 a.save()
  
@@ -199,6 +200,7 @@ class JoinView (FreeAccessView):
           'address_postalcode': request.POST.get('address_postalcode', ''),
           'address_state': request.POST.get('address_state', ''),
           'address_country': request.POST.get('address_country', ''),
+          'root_authority_hrn': request.POST.get('root_authority_hrn', '').lower(),
           'root_authorities': root_authorities,
           'authorities': authorities,
           }

diff --git a/portal/models.py b/portal/models.py
index 0de4ce0..08b095c 100644 (file)
--- a/portal/models.py
+++ b/portal/models.py
@@ -80,6 +80,8 @@ class PendingAuthority(models.Model):
     address_postalcode    = models.TextField()
     address_state         = models.TextField()
     address_country       = models.TextField()
+    # parent authority of the requested authority
+    authority_hrn         = models.TextField()
     created               = models.DateTimeField(auto_now_add = True)
  
 class PendingSlice(models.Model):

diff --git a/portal/templates/validate_pending.html b/portal/templates/validate_pending.html
index 0ab0e57..735abf6 100644 (file)
--- a/portal/templates/validate_pending.html
+++ b/portal/templates/validate_pending.html
@@ -88,7 +88,7 @@
             {% if request.type == 'slice' %}
         Slice name: {{request.slice_name}} -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}}
             {% else %} {# authority #}
-        TODO
+        Site name: {{request.site_name}} -- authority_hrn: {{request.site_authority}} -- City: {{request.address_city}} -- Country: {{request.address_country}}
             {% endif %}
         {% endif %}
                </td>

diff --git a/portal/validationview.py b/portal/validationview.py
index 1752e27..de79034 100644 (file)
--- a/portal/validationview.py
+++ b/portal/validationview.py
@@ -179,9 +179,9 @@ class ValidatePendingView(FreeAccessView):
             print "queried_pending_authorities = ", queried_pending_authorities
 
             requests = get_request_by_authority(queried_pending_authorities)
-            print "requests = ", requests
             for request in requests:
                 auth_hrn = request['authority_hrn']
+                print "authority for this request", auth_hrn
 
                 if auth_hrn in pi_my_authorities:
                     dest = ctx_my_authorities