fixes for rec.get

diff --git a/sface/screens/userscreen.py b/sface/screens/userscreen.py
index 08d4ff9..4eb7793 100644 (file)
--- a/sface/screens/userscreen.py
+++ b/sface/screens/userscreen.py
@@ -139,13 +139,13 @@ class UserModel(QStandardItemModel):
         slice_persons = []
 
         if sliceRec:
         slice_persons = []
 
         if sliceRec:

-            #for pi in sliceRec.get_field("PI", default=[]):
+            #for pi in sliceRec.get("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)
 
             #    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=[]):
+            for researcher in sliceRec.get("researcher", []):

                 name = str(researcher)
                 if not name in added_persons:
                      slice_persons.append({"name": name, "role": "researcher", "member": user_status["in"]})
                 name = str(researcher)
                 if not name in added_persons:
                      slice_persons.append({"name": name, "role": "researcher", "member": user_status["in"]})


@@ -182,15 +182,15 @@ class UserModel(QStandardItemModel):
             childStatus = str(item.child(row, MEMBERSHIP_STATUS_COLUMN).data(Qt.DisplayRole).toString())
 
             if (childStatus == user_status['add']):
             childStatus = str(item.child(row, MEMBERSHIP_STATUS_COLUMN).data(Qt.DisplayRole).toString())
 
             if (childStatus == user_status['add']):

-                researcher = slicerec.get_field("researcher", [])
+                researcher = slicerec.get("researcher", [])

                 researcher.append(childName)
                 slicerec["researcher"] = researcher
                 change = True
             elif (childStatus == user_status['remove']):
                 researcher.append(childName)
                 slicerec["researcher"] = researcher
                 change = True
             elif (childStatus == user_status['remove']):

-                if childName in slicerec.get_field("PI"):
-                     slicerec.get_field("PI").remove(childName)
-                if childName in slicerec.get_field("researcher"):
-                     slicerec.get_field("researcher").remove(childName)
+                if childName in slicerec.get("PI"):
+                     slicerec.get("PI").remove(childName)
+                if childName in slicerec.get("researcher"):
+                     slicerec.get("researcher").remove(childName)

                 change = True
 
         return change
                 change = True
 
         return change

diff --git a/sface/sfidata.py b/sface/sfidata.py
index 6f7b265..f4c872c 100644 (file)
--- a/sface/sfidata.py
+++ b/sface/sfidata.py
@@ -47,7 +47,7 @@ class SfiData:
     def getUserSliceHrns(self):
         rec = self.getUserRecord()
         if rec:
     def getUserSliceHrns(self):
         rec = self.getUserRecord()
         if rec:

-            slices = rec.get_field("slices")
+            slices = rec.get("slices",[])

             if (type(slices)!=list) or (len(slices)<1):
                 return []
 
             if (type(slices)!=list) or (len(slices)<1):
                 return []