From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Wed, 12 Feb 2014 15:06:06 +0000 (+0100)
Subject: AdminView: List user_email, authority, status
X-Git-Tag: myslice-1.1~341
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=608516c711884fd28688df1c000bdc26eef47dba

AdminView: List user_email, authority, status
---

diff --git a/portal/adminview.py b/portal/adminview.py
index 3400ad10..8a51da99 100644
--- a/portal/adminview.py
+++ b/portal/adminview.py
@@ -7,6 +7,7 @@ from manifold.manifoldapi       import execute_admin_query
 from plugins.querytable         import QueryTable
 from unfold.loginrequired       import LoginRequiredAutoLogoutView
 
+import json
 
 # View for platforms
 class AdminView(LoginRequiredAutoLogoutView):
@@ -19,14 +20,34 @@ class AdminView(LoginRequiredAutoLogoutView):
         #platform_query  = Query().get('local:platform').select('platform','platform_longname','gateway_type')
         email_list = []
         status_list = []
-        user_query  = Query().get('local:user').select('email','status')
+        authority_list = []
+        config={}
+
+        user_query  = Query().get('local:user').select('email','status','config')
         user_details = execute_admin_query(self.request, user_query)
+
         for user in user_details:
+            # get email
             email_list.append(user['email'])
-            status_list.append(user['status'])
+            # get status
+            if user['status'] == 0:
+                user_status = 'Disabled'
+            elif user['status'] == 1:
+                user_status = 'Validation Pending'
+            elif user['status'] == 2:
+                user_status = 'Enabled'
+            else:
+                user_status = 'N/A'
 
-        user_list = [{'email': t[0], 'status': t[1]}
-            for t in zip(email_list, status_list)]
+            status_list.append(user_status)
+            #get authority
+            #if user['config']:
+            user_config = json.loads(user['config'])
+            user_authority = user_config.get('authority','N/A')
+            authority_list.append(user_authority)
+    
+        user_list = [{'email': t[0], 'status': t[1], 'authority':t[2]}
+            for t in zip(email_list, status_list, authority_list)]
 
             
         #page.enqueue_query(user_query)
diff --git a/portal/templates/adminview.html b/portal/templates/adminview.html
index 63eb3d5a..71ecc81e 100644
--- a/portal/templates/adminview.html
+++ b/portal/templates/adminview.html
@@ -11,17 +11,19 @@
 
 {% block unfold_main %}
 
-<h1>Users</h1>
+<h1>MySlice Users</h1>
 <div id="middle" align="center">
     <div class="well">
         <table class="mytable table table-bordered table-hover">
             <tr class="odd">
                 <th>Email</th>
+				<th>Authority</th>
                 <th>Status</th>
             </tr>
             {% for user in user_list %}
             <tr class="border_bottom">
                 <td class="odd"> {{ user.email }} </td>
+				<td class="odd"> {{ user.authority }} </td>
 				<td class="even"> {{ user.status }} </td>
 
             </tr>