MyAcc: variable renaming
authorYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 17 Dec 2013 14:56:29 +0000 (15:56 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 17 Dec 2013 14:56:29 +0000 (15:56 +0100)
portal/accountview.py
portal/templates/account-view.html

index 5975ae5..06425a0 100644 (file)
@@ -49,8 +49,8 @@ class AccountView(LoginRequiredAutoLogoutView):
         my_users = ''
         my_slices = ''
         my_auths = ''
-        secondary_list = ''
-        lst = ''
+        ref_acc_list = ''
+        principal_acc_list = ''
         platform_name_list = []
         platform_name_secondary_list = []
         platform_access_list = []
@@ -127,7 +127,7 @@ class AccountView(LoginRequiredAutoLogoutView):
                         platform_name_secondary_list.append(platform_name)
                         account_type_secondary_list.append(account_type)
                         account_reference_list.append(account_reference)
-                        secondary_list = [{'platform_name': t[0], 'account_type': t[1], 'account_reference': t[2]} 
+                        ref_acc_list = [{'platform_name': t[0], 'account_type': t[1], 'account_reference': t[2]} 
                             for t in zip(platform_name_secondary_list, account_type_secondary_list, account_reference_list)]
                        
                     elif 'managed' in account_detail['auth_type']:
@@ -144,7 +144,7 @@ class AccountView(LoginRequiredAutoLogoutView):
                         usr_hrn_list.append(account_usr_hrn)
                         pub_key_list.append(account_pub_key)
                         # 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]} 
+                        principal_acc_list = [{'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)]
                     # to hide private key row if it doesn't exist    
                     if 'myslice' in platform_detail['platform']:
@@ -162,8 +162,8 @@ class AccountView(LoginRequiredAutoLogoutView):
             for t in itertools.izip_longest(total_platform_list)]
 
         context = super(AccountView, self).get_context_data(**kwargs)
-        context['data'] = lst
-        context['ref_acc'] = secondary_list
+        context['principal_acc'] = principal_acc_list
+        context['ref_acc'] = ref_acc_list
         context['platform_list'] = platform_list
         context['my_users'] = my_users
         context['my_slices'] = my_slices
index 1a010ae..1da1514 100644 (file)
                        <th>user_hrn</th>
                        <!--<th>Pub Key</th> -->
                </tr>   
-                       {% for row in data %}         
+                       {% for row in principal_acc %}         
                        <tr class="border_bottom">
                        <td class="odd"> {{ row.platform_name }} </td>
                        <td class="odd"> {{ row.account_type }} </td>