Connect on startup
This commit is contained in:
parent
350ef6ef7a
commit
4ca42380ee
|
@ -88,7 +88,6 @@ class ChangeMember(WizardPanel):
|
||||||
def check(self):
|
def check(self):
|
||||||
self.state['userid'] = self.userid.get_edit_text()
|
self.state['userid'] = self.userid.get_edit_text()
|
||||||
if self.state['userid']:
|
if self.state['userid']:
|
||||||
if not members.connected(): members.connect()
|
|
||||||
self.state['member'] = members.get(self.userid.get_edit_text())
|
self.state['member'] = members.get(self.userid.get_edit_text())
|
||||||
if not self.state['member']:
|
if not self.state['member']:
|
||||||
set_status("Member not found")
|
set_status("Member not found")
|
||||||
|
|
|
@ -176,6 +176,9 @@ def group_members(data):
|
||||||
push_window(listbox, "Manage %s" % data["name"])
|
push_window(listbox, "Manage %s" % data["name"])
|
||||||
|
|
||||||
def run():
|
def run():
|
||||||
|
members.connect()
|
||||||
|
accounts.connect()
|
||||||
|
|
||||||
push_window( main_menu(), program_name() )
|
push_window( main_menu(), program_name() )
|
||||||
event_loop( ui )
|
event_loop( ui )
|
||||||
|
|
||||||
|
|
|
@ -154,7 +154,6 @@ class EndPage(WizardPanel):
|
||||||
problem = None
|
problem = None
|
||||||
if self.type == 'member':
|
if self.type == 'member':
|
||||||
try:
|
try:
|
||||||
if not members.connected(): members.connect()
|
|
||||||
members.new( self.state['userid'], self.state['name'], self.state['program'] )
|
members.new( self.state['userid'], self.state['name'], self.state['program'] )
|
||||||
except members.InvalidRealName:
|
except members.InvalidRealName:
|
||||||
problem = "Invalid real name"
|
problem = "Invalid real name"
|
||||||
|
@ -165,7 +164,6 @@ class EndPage(WizardPanel):
|
||||||
raise
|
raise
|
||||||
if not problem:
|
if not problem:
|
||||||
try:
|
try:
|
||||||
if not accounts.connected(): accounts.connect()
|
|
||||||
if self.type == 'member':
|
if self.type == 'member':
|
||||||
accounts.create_member( self.state['userid'], self.state['password'], self.state['name'] )
|
accounts.create_member( self.state['userid'], self.state['password'], self.state['name'] )
|
||||||
elif self.type == 'club':
|
elif self.type == 'club':
|
||||||
|
|
|
@ -31,7 +31,6 @@ class IntroPage(WizardPanel):
|
||||||
|
|
||||||
class InfoPage(WizardPanel):
|
class InfoPage(WizardPanel):
|
||||||
def init_widgets(self):
|
def init_widgets(self):
|
||||||
if not members.connected(): members.connect()
|
|
||||||
self.widgets = [
|
self.widgets = [
|
||||||
urwid.Text( "Positions" ),
|
urwid.Text( "Positions" ),
|
||||||
urwid.Divider(),
|
urwid.Divider(),
|
||||||
|
|
|
@ -29,7 +29,6 @@ class UserPage(WizardPanel):
|
||||||
self.state['userid'] = self.userid.get_edit_text()
|
self.state['userid'] = self.userid.get_edit_text()
|
||||||
self.state['member'] = None
|
self.state['member'] = None
|
||||||
if self.state['userid']:
|
if self.state['userid']:
|
||||||
if not members.connected(): members.connect()
|
|
||||||
self.state['member'] = members.get(self.userid.get_edit_text())
|
self.state['member'] = members.get(self.userid.get_edit_text())
|
||||||
if not self.state['member']:
|
if not self.state['member']:
|
||||||
set_status("Member not found")
|
set_status("Member not found")
|
||||||
|
|
|
@ -16,7 +16,6 @@ class TermPage(WizardPanel):
|
||||||
self.term,
|
self.term,
|
||||||
]
|
]
|
||||||
def check(self):
|
def check(self):
|
||||||
if not members.connected(): members.connect()
|
|
||||||
try:
|
try:
|
||||||
self.state['term'] = self.term.get_edit_text()
|
self.state['term'] = self.term.get_edit_text()
|
||||||
terms.parse( self.state['term'] )
|
terms.parse( self.state['term'] )
|
||||||
|
@ -38,7 +37,6 @@ class NamePage(WizardPanel):
|
||||||
self.name,
|
self.name,
|
||||||
]
|
]
|
||||||
def check(self):
|
def check(self):
|
||||||
if not members.connected(): members.connect()
|
|
||||||
self.state['name'] = self.name.get_edit_text()
|
self.state['name'] = self.name.get_edit_text()
|
||||||
if not self.state['name']:
|
if not self.state['name']:
|
||||||
self.focus_widget( self.name )
|
self.focus_widget( self.name )
|
||||||
|
@ -58,7 +56,6 @@ class GroupPage(WizardPanel):
|
||||||
self.group,
|
self.group,
|
||||||
]
|
]
|
||||||
def check(self):
|
def check(self):
|
||||||
if not members.connected(): members.connect()
|
|
||||||
self.state['group'] = self.group.get_edit_text()
|
self.state['group'] = self.group.get_edit_text()
|
||||||
if not self.state['group']:
|
if not self.state['group']:
|
||||||
self.focus_widget( self.group )
|
self.focus_widget( self.group )
|
||||||
|
|
Loading…
Reference in New Issue