04/09 update: separate internal users and customer
This commit is contained in:
+9
-1
@@ -129,7 +129,15 @@ def profile():
|
|||||||
@login_required
|
@login_required
|
||||||
@admin_required
|
@admin_required
|
||||||
def list_users():
|
def list_users():
|
||||||
users = User.query.order_by(User.created_at.desc()).all()
|
# Exclude customer accounts — those are managed exclusively via /customers
|
||||||
|
users = (
|
||||||
|
User.query
|
||||||
|
.filter(User.role != 'customer')
|
||||||
|
.order_by(User.created_at.desc())
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
logger.info('AUTH | list_users | admin=%s | internal_users_count=%s',
|
||||||
|
current_user.username, len(users))
|
||||||
return render_template('auth/users.html', users=users)
|
return render_template('auth/users.html', users=users)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -3,11 +3,12 @@
|
|||||||
{% block title %}User Management{% endblock %}
|
{% block title %}User Management{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="row mb-4">
|
<div class="row mb-4 align-items-center">
|
||||||
<div class="col-md-6">
|
<div class="col">
|
||||||
<h2><i class="bi bi-people-fill"></i> User Management</h2>
|
<h2><i class="bi bi-people-fill"></i> Internal User Management</h2>
|
||||||
|
<p class="text-muted mb-0">Manage staff accounts (Admin, Supervisor, Inspector, Project Manager). For customer accounts, visit <a href="{{ url_for('customers.index') }}">Customer Management</a>.</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-6 text-end">
|
<div class="col-auto">
|
||||||
<a href="{{ url_for('auth.create_user') }}" class="btn btn-primary">
|
<a href="{{ url_for('auth.create_user') }}" class="btn btn-primary">
|
||||||
<i class="bi bi-plus-circle"></i> Add User
|
<i class="bi bi-plus-circle"></i> Add User
|
||||||
</a>
|
</a>
|
||||||
|
|||||||
@@ -55,7 +55,6 @@ class UserForm(FlaskForm):
|
|||||||
('supervisor', 'Supervisor'),
|
('supervisor', 'Supervisor'),
|
||||||
('inspector', 'Inspector'),
|
('inspector', 'Inspector'),
|
||||||
('project_manager', 'Project Manager'),
|
('project_manager', 'Project Manager'),
|
||||||
('customer', 'Customer'),
|
|
||||||
], validators=[DataRequired()])
|
], validators=[DataRequired()])
|
||||||
|
|
||||||
def __init__(self, user=None, *args, **kwargs):
|
def __init__(self, user=None, *args, **kwargs):
|
||||||
|
|||||||
Reference in New Issue
Block a user