From 3e5b8290851a2396d2b23252d7c46fb58e75c541 Mon Sep 17 00:00:00 2001 From: Max Erenberg Date: Fri, 7 Oct 2022 08:13:59 -0400 Subject: [PATCH] check if mail_local_addresses exists in UWLDAP entry --- ceo/cli/members.py | 2 +- ceo/tui/controllers/AddUserController.py | 2 +- ceo/tui/views/AddUserView.py | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ceo/cli/members.py b/ceo/cli/members.py index 44e2ecd..d895a69 100644 --- a/ceo/cli/members.py +++ b/ceo/cli/members.py @@ -49,7 +49,7 @@ def add(username, cn, given_name, sn, program, num_terms, clubrep, forwarding_ad sn = result['sn'] if program is None and result.get('program'): program = result['program'] - if forwarding_address is None: + if forwarding_address is None and result.get('mail_local_addresses'): forwarding_address = result['mail_local_addresses'][0] if cn is None: cn = click.prompt('Full name') diff --git a/ceo/tui/controllers/AddUserController.py b/ceo/tui/controllers/AddUserController.py index 93a64c3..e679e85 100644 --- a/ceo/tui/controllers/AddUserController.py +++ b/ceo/tui/controllers/AddUserController.py @@ -106,5 +106,5 @@ class AddUserController(Controller): self.model.first_name = data.get('given_name', '') self.model.last_name = data.get('sn', '') self.model.program = data.get('program', '') - self.model.forwarding_address = data.get('mail_local_addresses', [''])[0] + self.model.forwarding_address = (data.get('mail_local_addresses') or [''])[0] self.app.run_in_main_loop(self._on_lookup_user_success) diff --git a/ceo/tui/views/AddUserView.py b/ceo/tui/views/AddUserView.py index 8a06ba4..d1335c3 100644 --- a/ceo/tui/views/AddUserView.py +++ b/ceo/tui/views/AddUserView.py @@ -53,6 +53,10 @@ class AddUserView(ColumnView): urwid.Text('Program:', align='right'), self.program_edit ), + ( + urwid.Text('Forwarding address:', align='right'), + self.forwarding_address_edit + ), ( urwid.Text('Number of terms:', align='right'), self.num_terms_edit