04/24 Added import website in bulk

This commit is contained in:
2026-04-24 13:57:49 -04:00
parent 5f2a4e4749
commit 88b5e85c5b
7 changed files with 567 additions and 33 deletions
+11 -11
View File
@@ -308,7 +308,7 @@ def get_all_users():
try:
conn = get_connection()
cur = conn.cursor(dictionary=True)
cur.execute("SELECT id, username, role, full_name, is_active, created_at FROM users ORDER BY username")
cur.execute("SELECT id, username, role, full_name, email, is_active, created_at FROM users ORDER BY username")
rows = cur.fetchall()
cur.close()
return rows
@@ -322,7 +322,7 @@ def get_user_by_id(user_id: int):
try:
conn = get_connection()
cur = conn.cursor(dictionary=True)
cur.execute("SELECT id, username, role, full_name, is_active FROM users WHERE id=%s", (user_id,))
cur.execute("SELECT id, username, role, full_name, email, is_active FROM users WHERE id=%s", (user_id,))
row = cur.fetchone()
cur.close()
return row
@@ -331,40 +331,40 @@ def get_user_by_id(user_id: int):
conn.close()
def create_user(admin_id, username, password, role, full_name):
def create_user(admin_id, username, password, role, full_name, email=None):
conn = None
try:
conn = get_connection()
cur = conn.cursor()
cur.execute(
"INSERT INTO users (username, password, role, full_name) VALUES (%s,%s,%s,%s)",
(username, _hash_password(password), role, full_name)
"INSERT INTO users (username, password, role, full_name, email) VALUES (%s,%s,%s,%s,%s)",
(username, _hash_password(password), role, full_name, email or None)
)
conn.commit()
new_id = cur.lastrowid
cur.close()
log_action(admin_id, "CREATE_USER", "users", new_id,
f"Created user '{username}' role='{role}'.")
f"Created user '{username}' role='{role}' email='{email or ''}' .")
return new_id
finally:
if conn:
conn.close()
def update_user(admin_id, user_id, username, role, full_name, is_active, password=None):
def update_user(admin_id, user_id, username, role, full_name, is_active, password=None, email=None):
conn = None
try:
conn = get_connection()
cur = conn.cursor()
if password:
cur.execute(
"UPDATE users SET username=%s, role=%s, full_name=%s, is_active=%s, password=%s WHERE id=%s",
(username, role, full_name, is_active, _hash_password(password), user_id)
"UPDATE users SET username=%s, role=%s, full_name=%s, is_active=%s, email=%s, password=%s WHERE id=%s",
(username, role, full_name, is_active, email or None, _hash_password(password), user_id)
)
else:
cur.execute(
"UPDATE users SET username=%s, role=%s, full_name=%s, is_active=%s WHERE id=%s",
(username, role, full_name, is_active, user_id)
"UPDATE users SET username=%s, role=%s, full_name=%s, is_active=%s, email=%s WHERE id=%s",
(username, role, full_name, is_active, email or None, user_id)
)
conn.commit()
cur.close()