diff --git a/src/get_data.py b/src/get_data.py index 452e00a..95a0c9a 100644 --- a/src/get_data.py +++ b/src/get_data.py @@ -286,6 +286,8 @@ def create_user( :param site_group: name of site group """ + if site_group is None: + site_group = "ocf" user = UserSQL( email=email, @@ -294,4 +296,4 @@ def create_user( session.add(user) session.commit() - return user, message \ No newline at end of file + return user \ No newline at end of file diff --git a/src/sites_toolbox.py b/src/sites_toolbox.py index 313f245..49a578a 100644 --- a/src/sites_toolbox.py +++ b/src/sites_toolbox.py @@ -411,14 +411,16 @@ def sites_toolbox_page(): ) email = st.text_input("email") - + if email is not None: + if not re.match(r"[^@]+@[^@]+\.[^@]+", email): + st.write("Please enter a valid email address.") site_group = st.selectbox("Select a group", site_groups, key="site_group") # check that site group exists if st.button(f"Create new user"): site_group = get_site_group_by_name( session=session, site_group_name=site_group ) - user, message = create_user( + user = create_user( session=session, email=email, site_group=site_group, @@ -429,5 +431,5 @@ def sites_toolbox_page(): "date_added": (user.created_utc.strftime("%Y-%m-%d")), } st.json(user_details) - if st.button("Close site details"): + if st.button("Close user details"): st.empty()