noch mehr UI für den Dispatcher
This commit is contained in:
1 parent
4f87a19ba2
commit
7b8d2ec396
12 files changed
+1170
-70
No files matched your search
@@ -1,5 +1,5 @@
|
||||
import os
|
||||
from flask import Flask, g, session
|
||||
from flask import Flask, g, session, send_from_directory
|
||||
from config import config
|
||||
from cmbnet.extensions import sock
|
||||
|
||||
@@ -47,6 +47,7 @@ def create_app(config_name=None):
|
||||
from cmbnet.admin.api import admin_api_bp
|
||||
from cmbnet.api.init import api_init_bp
|
||||
from cmbnet.api.auth import api_auth_bp
|
||||
from cmbnet.api.groups import api_groups_bp
|
||||
|
||||
app.register_blueprint(auth_bp, url_prefix='/<tenant>')
|
||||
app.register_blueprint(views_bp, url_prefix='/<tenant>')
|
||||
@@ -59,6 +60,7 @@ def create_app(config_name=None):
|
||||
app.register_blueprint(admin_api_bp, url_prefix='/<tenant>/admin/api')
|
||||
app.register_blueprint(api_init_bp, url_prefix='/<tenant>/api')
|
||||
app.register_blueprint(api_auth_bp, url_prefix='/<tenant>/api')
|
||||
app.register_blueprint(api_groups_bp, url_prefix='/<tenant>/api')
|
||||
|
||||
# WebSocket Routes laden
|
||||
from cmbnet.ws import routes
|
||||
@@ -70,10 +72,18 @@ def create_app(config_name=None):
|
||||
interval=app.config.get('WS_HEARTBEAT_INTERVAL', 60)
|
||||
)
|
||||
|
||||
# Favicon explizit bedienen, damit /favicon.ico nicht als Tenant-Pfad
|
||||
# interpretiert wird.
|
||||
@app.route('/favicon.ico')
|
||||
def favicon():
|
||||
return send_from_directory(
|
||||
app.static_folder, 'favicon.ico', mimetype='image/vnd.microsoft.icon'
|
||||
)
|
||||
|
||||
# Root redirect
|
||||
@app.route('/')
|
||||
def index():
|
||||
from flask import redirect, url_for
|
||||
return redirect(url_for('auth.login_select'))
|
||||
return redirect(url_for('auth.login_select', tenant=app.config['DEFAULT_TENANT']))
|
||||
|
||||
return app
|
||||
@@ -0,0 +1,37 @@
|
||||
"""
|
||||
API-Endpunkte für Gruppen im Dispatcher-View.
|
||||
"""
|
||||
from flask import Blueprint, jsonify, g, request
|
||||
|
||||
from cmbnet.auth import role_required
|
||||
from cmbnet.models.groups import GroupModel
|
||||
from cmbnet.services.groups_service import GroupsService
|
||||
from cmbnet.utils.helpers import log_transaction
|
||||
|
||||
api_groups_bp = Blueprint('api_groups', __name__)
|
||||
|
||||
|
||||
@api_groups_bp.route('/groups/<int:group_id>/alias', methods=['POST'])
|
||||
@role_required(['Dispatcher', 'Administrator'])
|
||||
def update_group_alias(group_id, **kwargs):
|
||||
"""Ändert den Aliasnamen einer Gruppe aus dem Dispatcher-View."""
|
||||
data = request.get_json(silent=True) or {}
|
||||
aliasname = str(data.get('aliasname') or '').strip()
|
||||
|
||||
if len(aliasname) > 120:
|
||||
return jsonify({'error': 'Aliasname ist zu lang (maximal 120 Zeichen)'}), 400
|
||||
|
||||
group = GroupModel.get_by_id(group_id, g.tenant_id)
|
||||
if not group:
|
||||
return jsonify({'error': 'Gruppe nicht gefunden'}), 404
|
||||
|
||||
if group['aliasname'] != aliasname:
|
||||
GroupModel.update(group_id, g.tenant_id, aliasname=aliasname)
|
||||
log_transaction(
|
||||
'group.alias_update', 'group', group_id,
|
||||
{'from': group['aliasname'], 'to': aliasname}
|
||||
)
|
||||
GroupsService.invalidate(g.tenant_id)
|
||||
GroupsService.load_from_db(g.tenant_id)
|
||||
|
||||
return jsonify({'success': True, 'aliasname': aliasname})
|
||||
@@ -1,7 +1,7 @@
|
||||
"""
|
||||
Authentifizierungs-Views
|
||||
"""
|
||||
from flask import Blueprint, render_template, request, redirect, url_for, session, flash, g
|
||||
from flask import Blueprint, render_template, request, redirect, url_for, session, flash, g, current_app
|
||||
from cmbnet.db import get_db
|
||||
from cmbnet.auth import verify_password
|
||||
|
||||
@@ -17,7 +17,7 @@ def load_tenant():
|
||||
tenant = db.execute('SELECT * FROM tenants WHERE code = ?', (tenant_code,)).fetchone()
|
||||
if not tenant:
|
||||
flash('Ungültiger Mandant', 'error')
|
||||
return redirect(url_for('auth.login_select'))
|
||||
return redirect(url_for('auth.login_select', tenant=current_app.config['DEFAULT_TENANT']))
|
||||
g.tenant_id = tenant['id']
|
||||
g.tenant_code = tenant['code']
|
||||
|
||||
|
||||
Reference in new issue
Block a user