From 5c3c3f2147e6adc9178fe82c80596772ce6f7240 Mon Sep 17 00:00:00 2001
From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Thu, 5 Dec 2013 18:28:01 +0100
Subject: [PATCH] FIX: http://trac.myslice.info/ticket/10

---
 portal/accountview.py              | 9 ++++++---
 portal/templates/account-view.html | 6 ++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/portal/accountview.py b/portal/accountview.py
index f7fa1b8d..f0e7a4a6 100644
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -60,12 +60,15 @@ class AccountView(LoginRequiredAutoLogoutView):
                     account_type_list.append(account_type)
                     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')
         
         # 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)]
-        #print "test"
-        #print lst
 
         context = super(AccountView, self).get_context_data(**kwargs)
         context['data'] = lst
@@ -74,7 +77,7 @@ class AccountView(LoginRequiredAutoLogoutView):
         context ['lastname'] = config.get('lastname',"?")
         context ['fullname'] = context['firstname'] +' '+ context['lastname']
         context ['authority'] = config.get('authority',"Unknown Authority")
-        #context['users'] = userlist.render(self.request)
+        context['user_private_key'] = account_priv_key
         
         # XXX This is repeated in all pages
         # more general variables expected in the template
diff --git a/portal/templates/account-view.html b/portal/templates/account-view.html
index 4b042468..11334526 100644
--- a/portal/templates/account-view.html
+++ b/portal/templates/account-view.html
@@ -110,12 +110,14 @@
 						<button id="upload_file" type="button" title="Upload a public key"> Upload </button>       
 	      			</td>
 	    		</tr>
-	    		<tr class="even" id="pkey_row" display="none">
-	      			<td class="key">Private Key </td>
+	    		<tr class="even" id="pkey_row">
+				 {%if 'N/A' not in user_private_key%}
+	      			<td class="key">Private Key </td> <!-- Hide if priv_key doesn't exist in myslice platform   -->
 	      			<td class="value">********<a href="#">
 	      				<button type="submit" name="dl_pkey" class="download" title="Download your privaye key" id="dl_pkey"> Download </button>
 	      				<button id="delete" name="delete" type="submit" title="Delete your private key">Delete </button>
 	    			</td>
+				 {%endif%}		
 	  			</tr>
 	  			<tr class="odd">
 	    			<td colspan="2">
-- 
2.43.0