From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Tue, 4 Mar 2014 09:36:44 +0000 (+0100)
Subject: SliceUsers: Adapted to new format: check users in slice
X-Git-Tag: myslice-1.1~245^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7867229e977e32d5cb2fd7872fe2f98322f9cbf4;p=myslice.git

SliceUsers: Adapted to new format: check users in slice
---

diff --git a/portal/templates/onelab/onelab_slice-user-view.html b/portal/templates/onelab/onelab_slice-user-view.html
index 02bad235..0d42a04e 100644
--- a/portal/templates/onelab/onelab_slice-user-view.html
+++ b/portal/templates/onelab/onelab_slice-user-view.html
@@ -61,18 +61,11 @@
                 user_row = "<tr>";
 				// checking the box for the users that belong to the selected slice
 				var flag_checkbox = 0;
-				for(var data in val.slice) {
-    				var element = val.slice[data];
-					console.log("element");
-					console.log(element);
-					for(var key in element) {
-    					var value = element[key];
-						if (value == 'ple.upmc.myslicedemo'){
-     						console.log("found!!");
-							flag_checkbox = 1;
-							user_row += "<td><input type='checkbox' checked='True'></td>";
-						}
-
+				for(var data in val.slices) {
+    				var element = val.slices[data];
+					if (element == 'ple.upmc.myslicedemo'){
+						flag_checkbox = 1;
+						user_row += "<td><input type='checkbox' checked='True'></td>";
 					}
 				}
 				if(flag_checkbox != 1){
diff --git a/portal/usersview.py b/portal/usersview.py
index e9856c8c..63954657 100644
--- a/portal/usersview.py
+++ b/portal/usersview.py
@@ -7,11 +7,17 @@ from manifoldapi.manifoldapi    import execute_admin_query
 from plugins.querytable         import QueryTable
 from unfold.loginrequired       import LoginRequiredAutoLogoutView
 from theme import ThemeView
+
+from django.shortcuts import render, render_to_response
+
 import json
 
 # View for platforms
 class UsersView(LoginRequiredAutoLogoutView, ThemeView):
     template_name = "usersview.html"
+    def dispatch(self, *args, **kwargs):
+        return super(UsersView, self).dispatch(*args, **kwargs)
+
 
     def get_context_data(self, **kwargs):
         page = Page(self.request)
@@ -49,26 +55,6 @@ class UsersView(LoginRequiredAutoLogoutView, ThemeView):
         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)
-
-        #page.expose_js_metadata()
-        #userlist = QueryTable(
-        #    page  = page,
-        #    title = 'List',
-        #    domid = 'checkboxes',
-        #    # this is the query at the core of the slice list
-        #    query = user_query,
-        #    query_all = user_query,
-        #    checkboxes = False,
-        #    init_key   = 'user',
-        #    datatables_options = { 
-        #        'iDisplayLength': 10,
-        #        'bLengthChange' : True,
-        #        'bAutoWidth'    : True,
-        #        },
-        #)
-
         context = super(UsersView, self).get_context_data(**kwargs)
         context['person']   = self.request.user
         context['user_list'] = user_list
@@ -77,12 +63,12 @@ class UsersView(LoginRequiredAutoLogoutView, ThemeView):
         # more general variables expected in the template
         context['title'] = 'Users in MySlice'
         # the menu items on the top
-        context['topmenu_items'] = topmenu_items_live('Users', page)
         # so we can sho who is logged
         context['username'] = the_user(self.request)
         context['theme'] = self.theme
-        context.update(page.prelude_env())
 
         context['layout_1_or_2']="layout-unfold2.html" if not context['username'] else "layout-unfold1.html"
+        #prelude_env = page.prelude_env()
+        #context.update(prelude_env)
 
-        return context
+        return render_to_response(self.template)