Improve exception handling

pull/5/head
David Bartley 15 years ago
parent d4c47073e0
commit 5a504220aa
  1. 4
      ceo/urwid/groups.py
  2. 19
      ceo/urwid/positions.py

@ -115,14 +115,14 @@ class EndPage(WizardPanel):
for group in data['groups']:
try:
members.change_group_member(action, group, self.state['userid'])
except:
except ldap.LDAPError:
failed.append(group)
if len(failed) == 0:
self.headtext.set_text("%s succeeded" % data['action'])
self.midtext.set_text("Congratulations, the group modification "
"has succeeded.")
else:
self.headtext.set_text("%s partially succeeded" % data['action'])
self.headtext.set_text("%s Results" % data['action'])
self.midtext.set_text("Failed to %s member to %s for the "
"following groups: %s. This may indicate an attempt to add a "
"duplicate group member or to delete a member that was not in "

@ -76,11 +76,20 @@ class EndPage(WizardPanel):
def focusable(self):
return False
def activate(self):
failed = []
for (position, info) in self.state['positions'].iteritems():
members.set_position(position, info)
self.headtext.set_text("Positions Updated")
self.midtext.set_text("Congratulations, positions have been updated. "
"You should rebuild the website in order to update the Positions "
"page.")
try:
members.set_position(position, info)
except ldap.LDAPError:
failed.append(position)
if len(failed) == 0:
self.headtext.set_text("Positions Updated")
self.midtext.set_text("Congratulations, positions have been "
"updated. You should rebuild the website in order to update "
"the Positions page.")
else:
self.headtext.set_text("Positions Results")
self.midtext.set_text("Failed to update the following positions: "
"%s." % join(failed))
def check(self):
pop_window()

Loading…
Cancel
Save