diff --git a/pylib/csc/apps/urwid/groups.py b/pylib/csc/apps/urwid/groups.py index 4641083..cc682ff 100644 --- a/pylib/csc/apps/urwid/groups.py +++ b/pylib/csc/apps/urwid/groups.py @@ -88,7 +88,6 @@ class ChangeMember(WizardPanel): def check(self): self.state['userid'] = self.userid.get_edit_text() if self.state['userid']: - if not members.connected(): members.connect() self.state['member'] = members.get(self.userid.get_edit_text()) if not self.state['member']: set_status("Member not found") diff --git a/pylib/csc/apps/urwid/main.py b/pylib/csc/apps/urwid/main.py index e061cc2..dd58865 100644 --- a/pylib/csc/apps/urwid/main.py +++ b/pylib/csc/apps/urwid/main.py @@ -176,6 +176,9 @@ def group_members(data): push_window(listbox, "Manage %s" % data["name"]) def run(): + members.connect() + accounts.connect() + push_window( main_menu(), program_name() ) event_loop( ui ) diff --git a/pylib/csc/apps/urwid/newmember.py b/pylib/csc/apps/urwid/newmember.py index c0f3ad1..fa6f1f1 100644 --- a/pylib/csc/apps/urwid/newmember.py +++ b/pylib/csc/apps/urwid/newmember.py @@ -154,7 +154,6 @@ class EndPage(WizardPanel): problem = None if self.type == 'member': try: - if not members.connected(): members.connect() members.new( self.state['userid'], self.state['name'], self.state['program'] ) except members.InvalidRealName: problem = "Invalid real name" @@ -165,7 +164,6 @@ class EndPage(WizardPanel): raise if not problem: try: - if not accounts.connected(): accounts.connect() if self.type == 'member': accounts.create_member( self.state['userid'], self.state['password'], self.state['name'] ) elif self.type == 'club': diff --git a/pylib/csc/apps/urwid/positions.py b/pylib/csc/apps/urwid/positions.py index 5ae27a0..285afd3 100644 --- a/pylib/csc/apps/urwid/positions.py +++ b/pylib/csc/apps/urwid/positions.py @@ -31,7 +31,6 @@ class IntroPage(WizardPanel): class InfoPage(WizardPanel): def init_widgets(self): - if not members.connected(): members.connect() self.widgets = [ urwid.Text( "Positions" ), urwid.Divider(), diff --git a/pylib/csc/apps/urwid/renew.py b/pylib/csc/apps/urwid/renew.py index b0932ba..5615eae 100644 --- a/pylib/csc/apps/urwid/renew.py +++ b/pylib/csc/apps/urwid/renew.py @@ -29,7 +29,6 @@ class UserPage(WizardPanel): self.state['userid'] = self.userid.get_edit_text() self.state['member'] = None if self.state['userid']: - if not members.connected(): members.connect() self.state['member'] = members.get(self.userid.get_edit_text()) if not self.state['member']: set_status("Member not found") diff --git a/pylib/csc/apps/urwid/search.py b/pylib/csc/apps/urwid/search.py index d531a82..a049b82 100644 --- a/pylib/csc/apps/urwid/search.py +++ b/pylib/csc/apps/urwid/search.py @@ -16,7 +16,6 @@ class TermPage(WizardPanel): self.term, ] def check(self): - if not members.connected(): members.connect() try: self.state['term'] = self.term.get_edit_text() terms.parse( self.state['term'] ) @@ -38,7 +37,6 @@ class NamePage(WizardPanel): self.name, ] def check(self): - if not members.connected(): members.connect() self.state['name'] = self.name.get_edit_text() if not self.state['name']: self.focus_widget( self.name ) @@ -58,7 +56,6 @@ class GroupPage(WizardPanel): self.group, ] def check(self): - if not members.connected(): members.connect() self.state['group'] = self.group.get_edit_text() if not self.state['group']: self.focus_widget( self.group )