From fd6780611d71d8849b4a3a59b95f64c2d7f12060 Mon Sep 17 00:00:00 2001
From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Mon, 9 Dec 2013 15:06:06 +0100
Subject: [PATCH] Concept of principal/reference account adeed

---
 portal/accountview.py              | 27 ++++++++++++++++++++-------
 portal/templates/account-view.html |  8 +++++---
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/portal/accountview.py b/portal/accountview.py
index f0e7a4a6..c52484fe 100644
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -44,13 +44,22 @@ class AccountView(LoginRequiredAutoLogoutView):
         account_pub_key = ''
         platform_name_list = []
         account_type_list = []
+        delegation_type_list = []
         usr_hrn_list = []
         pub_key_list = []          
         for account_detail in account_details:
             for platform_detail in platform_details:
                 if platform_detail['platform_id'] == account_detail['platform_id']:
                     platform_name = platform_detail['platform']
-                    account_type = account_detail['auth_type']
+                    if 'reference' in account_detail['auth_type']:
+                        account_type = 'Reference'
+                        delegation = 'N/A'
+                    elif 'managed' in account_detail['auth_type']:
+                        account_type = 'Principal'
+                        delegation = 'Automatic'
+                    else:
+                        account_type = 'Principal'
+                        delegation = 'Manual'
                     account_config = json.loads(account_detail['config'])
                     # a bit more pythonic
                     account_usr_hrn = account_config.get('user_hrn','N/A')
@@ -58,17 +67,21 @@ class AccountView(LoginRequiredAutoLogoutView):
                     
                     platform_name_list.append(platform_name)
                     account_type_list.append(account_type)
+                    delegation_type_list.append(delegation)
                     usr_hrn_list.append(account_usr_hrn)
                     pub_key_list.append(account_pub_key)
             
                 # to hide private key row if it doesn't exist    
-                if 'myslice' in platform_detail['platform']:
-                    account_config = json.loads(account_detail['config'])
-                    account_priv_key = account_config.get('user_private_key','N/A')
+                    if 'myslice' in platform_detail['platform']:
+                        account_config = json.loads(account_detail['config'])
+                        account_priv_key = account_config.get('user_private_key','N/A')
+                        print "testing"
+                        print account_priv_key
+                    #break
         
-        # combining 4 lists into 1 [to render in the template] 
-        lst = [{'platform_name': t[0], 'account_type': t[1], 'usr_hrn':t[2], 'usr_pubkey':t[3]} 
-               for t in zip(platform_name_list, account_type_list, usr_hrn_list, pub_key_list)]
+        # combining 5 lists into 1 [to render in the template] 
+        lst = [{'platform_name': t[0], 'account_type': t[1], 'delegation_type': t[2], 'usr_hrn':t[3], 'usr_pubkey':t[4]} 
+               for t in zip(platform_name_list, account_type_list, delegation_type_list, usr_hrn_list, pub_key_list)]
 
         context = super(AccountView, self).get_context_data(**kwargs)
         context['data'] = lst
diff --git a/portal/templates/account-view.html b/portal/templates/account-view.html
index 11334526..b28658c9 100644
--- a/portal/templates/account-view.html
+++ b/portal/templates/account-view.html
@@ -138,7 +138,8 @@
 		<table class="mytable"> 
 			<tr class="odd"> 
     			<th>Platform</th> 
-        		<th>Account Type</th> 
+        		<th>Account Type</th>
+				<th>Account_delegation</th>	 
         		<th>user_hrn</th>
         		<th>Pub Key</th>
     		</tr>   
@@ -146,8 +147,9 @@
    			<tr class="border_bottom">
     			<td class="odd"> {{ row.platform_name }} </td>
         		<td class="even"> {{ row.account_type }} </td>
-       			<td class="odd"> {{ row.usr_hrn }}  </td>
-        		<td class="even"> {{ row.usr_pubkey }} </td>
+				<td class="odd"> {{ row.delegation_type }} </td>
+       			<td class="even"> {{ row.usr_hrn }}  </td>
+        		<td class="odd"> {{ row.usr_pubkey }} </td>
     		</tr> 
 			{%endfor%}               
 		</table>
-- 
2.43.0