From 20fa72e36f12358f626f92b0056a103828c663f4 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 11 May 2022 20:46:44 +1000 Subject: [PATCH 1/4] Do not try to create a new admin user if one already exists with that name --- InvenTree/InvenTree/apps.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/InvenTree/InvenTree/apps.py b/InvenTree/InvenTree/apps.py index 7787bbfb0c..89b2edddda 100644 --- a/InvenTree/InvenTree/apps.py +++ b/InvenTree/InvenTree/apps.py @@ -190,7 +190,8 @@ class InvenTreeConfig(AppConfig): user = get_user_model() try: with transaction.atomic(): - new_user = user.objects.create_superuser(add_user, add_email, add_password) + if not user.objects.filter(username=add_user).exists(): + new_user = user.objects.create_superuser(add_user, add_email, add_password) logger.info(f'User {str(new_user)} was created!') except IntegrityError as _e: logger.warning(f'The user "{add_user}" could not be created due to the following error:\n{str(_e)}') From d7eab8e1a312f61f3edc0dd36a62220a3b5a6f65 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 11 May 2022 20:48:26 +1000 Subject: [PATCH 2/4] Improve log output --- InvenTree/InvenTree/apps.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/InvenTree/InvenTree/apps.py b/InvenTree/InvenTree/apps.py index 89b2edddda..3b09688162 100644 --- a/InvenTree/InvenTree/apps.py +++ b/InvenTree/InvenTree/apps.py @@ -190,9 +190,11 @@ class InvenTreeConfig(AppConfig): user = get_user_model() try: with transaction.atomic(): - if not user.objects.filter(username=add_user).exists(): + if user.objects.filter(username=add_user).exists(): + logger.info(f"User {str(new_user)} already exists - skipping creation") + else: new_user = user.objects.create_superuser(add_user, add_email, add_password) - logger.info(f'User {str(new_user)} was created!') + logger.info(f'User {str(new_user)} was created!') except IntegrityError as _e: logger.warning(f'The user "{add_user}" could not be created due to the following error:\n{str(_e)}') if settings.TESTING_ENV: From e1609c50db0f0ac9aa5a0ff4acf9e472f5317e36 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 11 May 2022 20:57:42 +1000 Subject: [PATCH 3/4] Typo fix --- InvenTree/InvenTree/apps.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/InvenTree/InvenTree/apps.py b/InvenTree/InvenTree/apps.py index 3b09688162..efe8894bd2 100644 --- a/InvenTree/InvenTree/apps.py +++ b/InvenTree/InvenTree/apps.py @@ -191,10 +191,10 @@ class InvenTreeConfig(AppConfig): try: with transaction.atomic(): if user.objects.filter(username=add_user).exists(): - logger.info(f"User {str(new_user)} already exists - skipping creation") + logger.info(f"User {add_user} already exists - skipping creation") else: new_user = user.objects.create_superuser(add_user, add_email, add_password) - logger.info(f'User {str(new_user)} was created!') + logger.info(f'User {add_user} was created!') except IntegrityError as _e: logger.warning(f'The user "{add_user}" could not be created due to the following error:\n{str(_e)}') if settings.TESTING_ENV: From f00c3639c0b3550a992c817ae936f25d073840dc Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 11 May 2022 21:04:36 +1000 Subject: [PATCH 4/4] PEP fxi --- InvenTree/InvenTree/apps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/InvenTree/apps.py b/InvenTree/InvenTree/apps.py index efe8894bd2..3531cc11d7 100644 --- a/InvenTree/InvenTree/apps.py +++ b/InvenTree/InvenTree/apps.py @@ -194,7 +194,7 @@ class InvenTreeConfig(AppConfig): logger.info(f"User {add_user} already exists - skipping creation") else: new_user = user.objects.create_superuser(add_user, add_email, add_password) - logger.info(f'User {add_user} was created!') + logger.info(f'User {str(new_user)} was created!') except IntegrityError as _e: logger.warning(f'The user "{add_user}" could not be created due to the following error:\n{str(_e)}') if settings.TESTING_ENV: