Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug/import-user-error' into 'bug/tz-fallback'

Browse Source 
Bug/import user error

See merge request crafty-controller/crafty-4!332
This commit is contained in:
Andrew 2022-06-13 19:21:07 +00:00
commit 7e7557f530
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/classes/shared/import3.py
View File

@ -38,18 +38,28 @@ class Import3:
# If there is only one user to import json needs to call the data differently
if isinstance(json_data, list):
for user in json_data:
HelperUsers.add_rawpass_user(user["username"], user["password"])
Console.info(f"Imported user {user['username']} from Crafty 3")
logger.info(f"Imported user {user['username']} from Crafty 3")
if str(user["username"]).lower() != "admin":
HelperUsers.add_rawpass_user(user["username"], user["password"])
Console.info(f"Imported user {user['username']} from Crafty 3")
logger.info(f"Imported user {user['username']} from Crafty 3")
else:
logger.info("Cannot create duplicate Admin account...skipping.")
else:
Console.info(
"There is only one user detected. "
"Cannot create duplicate Admin account."
)
logger.info(
"There is only one user detected. "
"Cannot create duplicate Admin account."
)
if str(json_data["username"]).lower() != "admin":
HelperUsers.add_rawpass_user(
json_data["username"], json_data["password"]
)
Console.info(f"Imported user {json_data['username']} from Crafty 3")
logger.info(f"Imported user {json_data['username']} from Crafty 3")
else:
Console.info(
"There is only one user detected. "
"Cannot create duplicate Admin account."
)
logger.info(
"There is only one user detected. "
"Cannot create duplicate Admin account."
)
def import_servers(self, json_data, controller):
# If there is only one server to import json needs to call the data differently