From: smbaker <smbaker@fc8clean.lan>
Date: Tue, 30 Aug 2011 21:58:59 +0000 (-0700)
Subject: remove roles from user screen, and ignore slice PIs
X-Git-Tag: sface-0.1-17~4
X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=8986ddbf0aa19aac7173fc31bb0f267db24bb7eb;ds=sidebyside

remove roles from user screen, and ignore slice PIs
---

diff --git a/sface/screens/userscreen.py b/sface/screens/userscreen.py
index 7745d59..bcb87f0 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):