From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Fri, 14 Feb 2014 16:23:17 +0000 (+0100)
Subject: ManageUser: Display OK. Edit- ToDo
X-Git-Tag: myslice-1.1~335^2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=36f0a2f013dc861c84f2f2781ccffa05228759a7

ManageUser: Display OK. Edit- ToDo
---

diff --git a/portal/manageuserview.py b/portal/manageuserview.py
index e2a3231f..59fc1d62 100644
--- a/portal/manageuserview.py
+++ b/portal/manageuserview.py
@@ -1,7 +1,7 @@
 from unfold.loginrequired               import LoginRequiredAutoLogoutView
 #
 from manifold.core.query                import Query
-from manifold.manifoldapi               import execute_query
+from manifold.manifoldapi               import execute_query, execute_admin_query
 from portal.actions                     import manifold_update_user, manifold_update_account, manifold_add_account, manifold_delete_account, sfa_update_user
 #
 from unfold.page                        import Page    
@@ -29,16 +29,20 @@ class UserView(LoginRequiredAutoLogoutView):
         page.add_css_files ( [ "css/onelab.css", "css/account_view.css","css/plugin.css" ] )
 
         for key, value in kwargs.iteritems():
-            print "%s = %s" % (key, value)
-            #if key == "platformname":
-            #    platformname=value
+            #print "%s = %s" % (key, value)
+            if key == "email":
+                selected_email=value
     
-        user_query  = Query().get('local:user').select('config','email','status')
-        user_details = execute_query(self.request, user_query)
+        user_query  = Query().get('local:user').filter_by('email', '==', selected_email).select('user_id','config','email','status')
+        user_details = execute_admin_query(self.request, user_query)
         
         # not always found in user_details...
         config={}
         for user_detail in user_details:
+            user_id = user_detail['user_id']
+            user_email = user_detail['email'] 
+            print "hello_world"
+            print user_id          
             # different significations of user_status
             if user_detail['status'] == 0: 
                 user_status = 'Disabled'
@@ -53,9 +57,9 @@ class UserView(LoginRequiredAutoLogoutView):
                 config = json.loads(user_detail['config'])
 
         platform_query  = Query().get('local:platform').select('platform_id','platform','gateway_type','disabled')
-        account_query  = Query().get('local:account').select('user_id','platform_id','auth_type','config')
+        account_query  = Query().get('local:account').filter_by('user_id', '==', user_id).select('user_id','platform_id','auth_type','config')
         platform_details = execute_query(self.request, platform_query)
-        account_details = execute_query(self.request, account_query)
+        account_details = execute_admin_query(self.request, account_query)
        
         # initial assignment needed for users having account.config = {} 
         platform_name = ''
@@ -190,7 +194,7 @@ class UserView(LoginRequiredAutoLogoutView):
         context['my_slices'] = my_slices
         context['my_auths'] = my_auths
         context['user_status'] = user_status
-        context['person']   = self.request.user
+        context['user_email']   = user_email
         context['firstname'] = config.get('firstname',"?")
         context['lastname'] = config.get('lastname',"?")
         context['fullname'] = context['firstname'] +' '+ context['lastname']
diff --git a/portal/templates/manageuserview.html b/portal/templates/manageuserview.html
index 74a2a0fd..24ca18cb 100644
--- a/portal/templates/manageuserview.html
+++ b/portal/templates/manageuserview.html
@@ -25,39 +25,12 @@
 	    		<tr class="even">
 	      			<td class="key">Email</td>
 	      			<td class="value">
-						<span id="emailval" class="value" >{{ person.email }}</span>
-						<button class="btn btn-default btn-xs" type="button" id="edit_email" onclick="editAlert()"  title="To change your affiliation please contact the administrator">
-    						<span class="glyphicon glyphicon-question-sign"></span> Edit
+						<span id="emailval" class="value" >{{ user_email }}</span>
+						<button class="btn btn-default btn-xs" type="button" id="edit_email"  title="To change your affiliation please contact the administrator">
+    						<span class="glyphicon glyphicon-edit"></span> Edit
 						</button>
 					</td>
 	      		</tr>
-	      		<tr class="odd">
-					<td class="key">Password</td>
-					<td class="value"> 
-		  				<button class="btn btn-default btn-xs" type="button" title="Password" name="edit_pass" id="edit_pass">
-							<span class="glyphicon glyphicon-edit"></span> Edit
-						</button>
-		  				<span id="passval"class="value">******** </span>
-		  				<span class="hide_this" id="span_pass">
-		    				<button type="button" class="btn btn-default btn-xs" title="Cancel" id="cancel_pass_change"> Cancel </button>
-		    				<div style='display:none;' id="pass_form">
-		    				<input type='hidden'  value='' /></div>
-		    				<table id="edit_password">
-		      					<tr>
-									<td>Enter password: </td>
-									<td class="field"> <input type="password" name="password" id="password" /> </td>
-		      						</tr>
-		      						<tr>
-									<td>Confirm password: </td>
-									<td class="field"> 
-			  							<input type="password" name="confirmpassword" id="confirmpassword" /> 
-			  							<input type="submit" class="btn btn-default btn-xs" name="submit_pass" value="Save"/> 
-									</td>
-		      					</tr>
-		    				</table>
-		  				</span>	
-					</td>
-	      		</tr>
 	      		<tr class="even">
 					<td class="key">Full Name</td>
 					<td class="value">
@@ -78,8 +51,8 @@
 					<td class="key">Authority</td>
 					<td class="value">
 		  				<span id="affval" class="value">{{ authority }}</span>
-						 <button class="btn btn-default btn-xs" type="button" id="edit_auth" onclick="editAlert()"  title="To change your authority please contact the administrator">
-     						<span class="glyphicon glyphicon-question-sign"></span> Edit
+						 <button class="btn btn-default btn-xs" type="button" id="edit_auth"   title="To change your authority please contact the administrator">
+     						<span class="glyphicon glyphicon-edit"></span> Edit
 						 </button>
 		  			</td>
 				</tr>
@@ -133,14 +106,6 @@
 					</td>
 				 {%endif%}		
 	  			</tr>
-	  			<tr class="odd">
-	    			<td colspan="2">
-	      				<p class="message" id="pkey_del_msg"><b> Tradeoff:</b> Ease-of-use vs Security.<br>
-							<b>Ease-of-use:</b> Automatic account delegation. Don't delete private key.<br>
-							<b>Security:</b> Manual account delegation. Download & Delete private key.
-						</p>
-	    			</td>
-	  			</tr>
 			</table>
 	</div>
 </div>