From: Yasin Date: Tue, 17 Dec 2013 14:56:29 +0000 (+0100) Subject: MyAcc: variable renaming X-Git-Tag: myslice-0.3-0~53 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=8fee4a801b9b11f3f40aad82c41e2c2cdcf48080 MyAcc: variable renaming --- diff --git a/portal/accountview.py b/portal/accountview.py index 5975ae5e..06425a0a 100644 --- a/portal/accountview.py +++ b/portal/accountview.py @@ -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 diff --git a/portal/templates/account-view.html b/portal/templates/account-view.html index 1a010ae1..1da1514c 100644 --- a/portal/templates/account-view.html +++ b/portal/templates/account-view.html @@ -143,7 +143,7 @@ user_hrn - {% for row in data %} + {% for row in principal_acc %} {{ row.platform_name }} {{ row.account_type }}