"Refactor user database schema and related utilities using Conventional Commits (feat)"
This commit is contained in:
@@ -8,17 +8,17 @@ from utils.logging_config import get_logger
|
|||||||
users_blueprint = Blueprint('users', __name__)
|
users_blueprint = Blueprint('users', __name__)
|
||||||
logger = get_logger("users")
|
logger = get_logger("users")
|
||||||
|
|
||||||
def admin_required(f):
|
def users_admin_required(f):
|
||||||
"""Decorator zur Prüfung der Admin-Berechtigung."""
|
"""Decorator zur Prüfung der Admin-Berechtigung für Users Blueprint."""
|
||||||
@login_required
|
@login_required
|
||||||
def decorated_function(*args, **kwargs):
|
def users_decorated_function(*args, **kwargs):
|
||||||
if not current_user.is_admin:
|
if not current_user.is_admin:
|
||||||
abort(403, "Nur Administratoren haben Zugriff auf diese Seite")
|
abort(403, "Nur Administratoren haben Zugriff auf diese Seite")
|
||||||
return f(*args, **kwargs)
|
return f(*args, **kwargs)
|
||||||
return decorated_function
|
return users_decorated_function
|
||||||
|
|
||||||
@users_blueprint.route('/admin/users/<int:user_id>/permissions', methods=['GET'])
|
@users_blueprint.route('/admin/users/<int:user_id>/permissions', methods=['GET'])
|
||||||
@admin_required
|
@users_admin_required
|
||||||
def admin_user_permissions(user_id):
|
def admin_user_permissions(user_id):
|
||||||
"""Benutzerberechtigungen anzeigen und bearbeiten."""
|
"""Benutzerberechtigungen anzeigen und bearbeiten."""
|
||||||
with get_cached_session() as db_session:
|
with get_cached_session() as db_session:
|
||||||
@@ -63,7 +63,7 @@ def api_get_user_permissions(user_id):
|
|||||||
return jsonify({"error": "Fehler beim Verarbeiten der Anfrage"}), 500
|
return jsonify({"error": "Fehler beim Verarbeiten der Anfrage"}), 500
|
||||||
|
|
||||||
@users_blueprint.route('/api/users/<int:user_id>/permissions', methods=['PUT'])
|
@users_blueprint.route('/api/users/<int:user_id>/permissions', methods=['PUT'])
|
||||||
@admin_required
|
@users_admin_required
|
||||||
def api_update_user_permissions(user_id):
|
def api_update_user_permissions(user_id):
|
||||||
"""Benutzerberechtigungen aktualisieren."""
|
"""Benutzerberechtigungen aktualisieren."""
|
||||||
try:
|
try:
|
||||||
@@ -110,7 +110,7 @@ def api_update_user_permissions(user_id):
|
|||||||
return jsonify({"error": "Fehler beim Verarbeiten der Anfrage"}), 500
|
return jsonify({"error": "Fehler beim Verarbeiten der Anfrage"}), 500
|
||||||
|
|
||||||
@users_blueprint.route('/admin/users/<int:user_id>/permissions/update', methods=['POST'])
|
@users_blueprint.route('/admin/users/<int:user_id>/permissions/update', methods=['POST'])
|
||||||
@admin_required
|
@users_admin_required
|
||||||
def admin_update_user_permissions(user_id):
|
def admin_update_user_permissions(user_id):
|
||||||
"""Benutzerberechtigungen über Formular aktualisieren."""
|
"""Benutzerberechtigungen über Formular aktualisieren."""
|
||||||
try:
|
try:
|
||||||
@@ -148,7 +148,7 @@ def admin_update_user_permissions(user_id):
|
|||||||
|
|
||||||
# Erweiterung des bestehenden Benutzer-Bearbeitungsformulars
|
# Erweiterung des bestehenden Benutzer-Bearbeitungsformulars
|
||||||
@users_blueprint.route('/admin/users/<int:user_id>/edit/permissions', methods=['GET'])
|
@users_blueprint.route('/admin/users/<int:user_id>/edit/permissions', methods=['GET'])
|
||||||
@admin_required
|
@users_admin_required
|
||||||
def admin_edit_user_permissions_section(user_id):
|
def admin_edit_user_permissions_section(user_id):
|
||||||
"""Rendert nur den Berechtigungsteil für das Benutzer-Edit-Formular."""
|
"""Rendert nur den Berechtigungsteil für das Benutzer-Edit-Formular."""
|
||||||
with get_cached_session() as db_session:
|
with get_cached_session() as db_session:
|
||||||
|
Binary file not shown.
Binary file not shown.
@@ -10,7 +10,7 @@ from datetime import datetime
|
|||||||
# Pfad zur App hinzufügen
|
# Pfad zur App hinzufügen
|
||||||
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
|
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
|
||||||
|
|
||||||
from models import init_db, get_cached_session, GuestRequest, UserPermission, Notification
|
from models import init_db, get_cached_session, GuestRequest, UserPermission, Notification, User
|
||||||
from utils.logging_config import get_logger
|
from utils.logging_config import get_logger
|
||||||
|
|
||||||
logger = get_logger("migrate")
|
logger = get_logger("migrate")
|
||||||
|
@@ -121,8 +121,8 @@ class ColoredFormatter(logging.Formatter):
|
|||||||
level_name = record.levelname
|
level_name = record.levelname
|
||||||
category_name = record.name.split('.')[-1] if '.' in record.name else record.name
|
category_name = record.name.split('.')[-1] if '.' in record.name else record.name
|
||||||
|
|
||||||
level_emoji = LOG_EMOJIS.get(level_name, '')
|
level_emoji = safe_emoji(LOG_EMOJIS.get(level_name, ''))
|
||||||
category_emoji = LOG_EMOJIS.get(category_name, '')
|
category_emoji = safe_emoji(LOG_EMOJIS.get(category_name, ''))
|
||||||
|
|
||||||
# Record-Objekt modifizieren (aber temporär)
|
# Record-Objekt modifizieren (aber temporär)
|
||||||
original_levelname = record.levelname
|
original_levelname = record.levelname
|
||||||
|
Reference in New Issue
Block a user