X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sface%2Fscreens%2Fuserscreen.py;h=db0d3e78219d0911966aa0976d1167e3b2c59d4d;hb=1123a48de43e859c145f1489257b92ad79323e14;hp=1f647a1da309ffc2133aa29fb92b5a4c27595735;hpb=eb430bcb674133ab6f8d18086aafa190819dd641;p=sface.git
diff --git a/sface/screens/userscreen.py b/sface/screens/userscreen.py
index 1f647a1..db0d3e7 100644
--- a/sface/screens/userscreen.py
+++ b/sface/screens/userscreen.py
@@ -127,7 +127,6 @@ class UserView(QTableView):
model = current.model()
node_index = model.index(current.row(), 0, current.parent())
node_data = node_index.data().toString()
- self.emit(SIGNAL('hostnameClicked(QString)'), node_data)
def hideUnusableColumns(self):
self.hideColumn(SERVER_MEMBERSHIP_STATUS_COLUMN)
@@ -159,10 +158,12 @@ class UserModel(QStandardItemModel):
while (os.path.exists(config.getAuthorityListFile(i))):
rec = self.readUserRecord(i)
if rec:
- name = str(rec.get_name())
- if not name in added_persons:
- slice_persons.append({"name": name, "role": "", "member": user_status["out"]})
- added_persons.append(name)
+ type = str(rec.get_type())
+ if (type == "user"):
+ name = str(rec.get_name())
+ if not name in added_persons:
+ slice_persons.append({"name": name, "role": "", "member": user_status["out"]})
+ added_persons.append(name)
i=i+1
rootItem = self.invisibleRootItem()
@@ -272,17 +273,35 @@ class UsersWidget(QWidget):
self.updateView()
def submitFinished(self):
- self.setStatus("Slice data submitted.")
- QTimer.singleShot(1000, self.refresh)
+ self.disconnect(self.process, SIGNAL('finished()'), self.submitFinished)
+
+ faultString = self.process.getFaultString()
+ if not faultString:
+ self.setStatus("Slice user data submitted.")
+ QTimer.singleShot(1000, self.refresh)
+ else:
+ self.setStatus("Slice user submit failed: %s" % (faultString))
def getSliceRecordFinished(self):
- self.setStatus("Authority data refreshed.", timeout=5000)
- self.refreshAuthority()
+ self.disconnect(self.process, SIGNAL('finished()'), self.getSliceRecordFinished)
+
+ faultString = self.process.getFaultString()
+ if not faultString:
+ self.setStatus("Slice record refreshed.")
+ self.refreshAuthority()
+ else:
+ self.setStatus("Slice rec refresh error: %s" % (faultString))
def getAuthorityRecordFinished(self):
- self.setStatus("Slice data refreshed.", timeout=5000)
- self.updateView()
- #self.parent().signalAll("usersUpdated")
+ self.disconnect(self.process, SIGNAL('finished()'), self.getAuthorityRecordFinished)
+
+ faultString = self.process.getFaultString()
+ if not faultString:
+ self.setStatus("User data refreshed.")
+ self.updateView()
+ #self.parent().signalAll("usersUpdated")
+ else:
+ self.setStatus("Authority rec refresh error: %s" % (faultString))
def readSliceRecord(self):
rec_file = config.getSliceRecordFile()
@@ -325,7 +344,6 @@ class UsersWidget(QWidget):
rec_file = config.getSliceRecordFile()
file(rec_file, "w").write(rec.save_to_string())
- self.disconnect(self.process, SIGNAL('finished()'), self.getAuthorityRecordFinished)
self.connect(self.process, SIGNAL('finished()'), self.submitFinished)
self.process.updateRecord(rec_file)
@@ -340,17 +358,15 @@ class UsersWidget(QWidget):
self.setStatus("There is already a process running. Please wait.")
return
- self.disconnect(self.process, SIGNAL('finished()'), self.submitFinished)
self.connect(self.process, SIGNAL('finished()'), self.getSliceRecordFinished)
self.process.getSliceRecord()
self.setStatus("Refreshing slice record. This will take some time...")
def refreshAuthority(self):
- self.disconnect(self.process, SIGNAL('finished()'), self.getSliceRecordFinished)
self.connect(self.process, SIGNAL('finished()'), self.getAuthorityRecordFinished)
- self.process.listRecords(config.getAuthority(), "user", config.getAuthorityListFile())
+ self.process.listRecords(config.getAuthority(), None, config.getAuthorityListFile())
self.setStatus("Refreshing user records. This will take some time...")
def updateView(self):