X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fuserscreen.py;h=9adf116258fbbf7339d22aa4c48c76a2056d6492;hp=7745d59b54a35968e102e901bd5957e389136974;hb=9e2f22b81278e64392071fffe4724be8787827e6;hpb=fc94b4a9a0fe853ac7f1b3beea05ee5a279446e9

diff --git a/sface/screens/userscreen.py b/sface/screens/userscreen.py
index 7745d59..9adf116 100644
--- a/sface/screens/userscreen.py
+++ b/sface/screens/userscreen.py
@@ -11,9 +11,9 @@ from sface.sfiprocess import SfiProcess
 from sface.screens.sfascreen import SfaScreen
 
 NAME_COLUMN = 0
-ROLE_COLUMN = 1
-MEMBERSHIP_STATUS_COLUMN = 2
-SERVER_MEMBERSHIP_STATUS_COLUMN = 3
+#ROLE_COLUMN = 1
+MEMBERSHIP_STATUS_COLUMN = 1
+SERVER_MEMBERSHIP_STATUS_COLUMN = 2
 
 user_status = { "in": "Already Selected",
                 "out": "Not Selected",
@@ -219,12 +219,13 @@ class UsersWidget(QWidget):
         added_persons = []
         slice_persons = []
 
-        for pi in sliceRec.get_field("PI"):
-            name = str(pi)
-            if not name in added_persons:
-                 slice_persons.append({"name": name, "role": "PI", "member": user_status["in"]})
-                 added_persons.append(name)
-        for researcher in sliceRec.get_field("researcher"):
+        #for pi in sliceRec.get_field("PI", default=[]):
+        #    name = str(pi)
+        #    if not name in added_persons:
+        #         slice_persons.append({"name": name, "role": "PI", "member": user_status["in"]})
+        #         added_persons.append(name)
+
+        for researcher in sliceRec.get_field("researcher", default=[]):
             name = str(researcher)
             if not name in added_persons:
                  slice_persons.append({"name": name, "role": "researcher", "member": user_status["in"]})
@@ -244,11 +245,11 @@ class UsersWidget(QWidget):
 
         for person in slice_persons:
             rootItem.appendRow([QStandardItem(QString(person["name"])),
-                               QStandardItem(QString(person["role"])),
+                               #QStandardItem(QString(person["role"])),
                                QStandardItem(QString(person["member"])),
                                QStandardItem(QString(person["member"]))])
 
-        headers = QStringList() << "User Name" << "Role" << "Status" << "ServerStatus"
+        headers = QStringList() << "User Name" << "Status" << "ServerStatus"
         self.userModel.setHorizontalHeaderLabels(headers)
 
     def updateView(self):
@@ -274,7 +275,9 @@ class UsersWidget(QWidget):
             childStatus = str(item.child(row, MEMBERSHIP_STATUS_COLUMN).data(Qt.DisplayRole).toString())
 
             if (childStatus == user_status['add']):
-                slicerec.get_field("researcher").append(childName)
+                researcher = slicerec.get_field("researcher", [])
+                researcher.append(childName)
+                slicerec["researcher"] = researcher
                 change = True
             elif (childStatus == user_status['remove']):
                 if childName in slicerec.get_field("PI"):
@@ -283,7 +286,6 @@ class UsersWidget(QWidget):
                      slicerec.get_field("researcher").remove(childName)
                 change = True
 
-        print "XXX", slicerec.get_field("researcher")
         return change