Remove student account fields and related logic from registration process
This commit is contained in:
+4
-20
@@ -7060,9 +7060,7 @@ def register():
|
|||||||
|
|
||||||
permission_preset = (request.form.get('permission_preset') or 'standard_user').strip()
|
permission_preset = (request.form.get('permission_preset') or 'standard_user').strip()
|
||||||
use_custom_permissions = request.form.get('use_custom_permissions') == 'on'
|
use_custom_permissions = request.form.get('use_custom_permissions') == 'on'
|
||||||
is_student = bool(request.form.get('is_student')) if cfg.STUDENT_CARDS_MODULE_ENABLED else False
|
|
||||||
student_card_id = us.normalize_student_card_id(request.form.get('student_card_id')) if cfg.STUDENT_CARDS_MODULE_ENABLED else ''
|
|
||||||
max_borrow_days_raw = request.form.get('max_borrow_days') if cfg.STUDENT_CARDS_MODULE_ENABLED else None
|
|
||||||
if not username or not password or not name or not last_name:
|
if not username or not password or not name or not last_name:
|
||||||
flash('Bitte füllen Sie alle Felder aus', 'error')
|
flash('Bitte füllen Sie alle Felder aus', 'error')
|
||||||
return redirect(url_for('register'))
|
return redirect(url_for('register'))
|
||||||
@@ -7081,28 +7079,14 @@ def register():
|
|||||||
for endpoint_name, _ in PERMISSION_PAGE_OPTIONS:
|
for endpoint_name, _ in PERMISSION_PAGE_OPTIONS:
|
||||||
page_permissions[endpoint_name] = request.form.get(f'page_{endpoint_name}') == 'on'
|
page_permissions[endpoint_name] = request.form.get(f'page_{endpoint_name}') == 'on'
|
||||||
|
|
||||||
max_borrow_days = None
|
|
||||||
if is_student:
|
|
||||||
if not student_card_id:
|
|
||||||
flash('Für Schüler muss eine Ausweis-ID angegeben werden.', 'error')
|
|
||||||
return redirect(url_for('register'))
|
|
||||||
if us.student_card_exists(student_card_id):
|
|
||||||
flash('Die Ausweis-ID ist bereits vergeben.', 'error')
|
|
||||||
return redirect(url_for('register'))
|
|
||||||
try:
|
|
||||||
max_borrow_days = int(max_borrow_days_raw) if max_borrow_days_raw else cfg.STUDENT_DEFAULT_BORROW_DAYS
|
|
||||||
except (TypeError, ValueError):
|
|
||||||
max_borrow_days = cfg.STUDENT_DEFAULT_BORROW_DAYS
|
|
||||||
max_borrow_days = max(1, min(max_borrow_days, cfg.STUDENT_MAX_BORROW_DAYS))
|
|
||||||
|
|
||||||
us.add_user(
|
us.add_user(
|
||||||
username,
|
username,
|
||||||
password,
|
password,
|
||||||
name,
|
name,
|
||||||
last_name,
|
last_name,
|
||||||
is_student=is_student,
|
is_student=False,
|
||||||
student_card_id=student_card_id if is_student else None,
|
student_card_id=None,
|
||||||
max_borrow_days=max_borrow_days,
|
max_borrow_days=None,
|
||||||
permission_preset=permission_preset,
|
permission_preset=permission_preset,
|
||||||
action_permissions=action_permissions,
|
action_permissions=action_permissions,
|
||||||
page_permissions=page_permissions,
|
page_permissions=page_permissions,
|
||||||
|
|||||||
@@ -70,27 +70,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% if student_cards_module_enabled %}
|
|
||||||
<div class="form-group">
|
|
||||||
<label style="display:flex; align-items:center; gap:8px; color:#1f2937;">
|
|
||||||
<input type="checkbox" id="is-student" name="is_student" style="width:auto;">
|
|
||||||
Schülerkonto mit Ausweis
|
|
||||||
</label>
|
|
||||||
<div id="student-fields" style="display:none; margin-top:10px;">
|
|
||||||
<label for="student-card-id">Ausweis-ID</label>
|
|
||||||
<div class="input-container">
|
|
||||||
<span class="input-icon">🪪</span>
|
|
||||||
<input type="text" id="student-card-id" name="student_card_id" placeholder="z.B. S-2026-001">
|
|
||||||
</div>
|
|
||||||
<label for="max-borrow-days" style="margin-top:10px;">Standard-Ausleihdauer (Tage)</label>
|
|
||||||
<div class="input-container">
|
|
||||||
<span class="input-icon">📅</span>
|
|
||||||
<input type="number" id="max-borrow-days" name="max_borrow_days" min="1" max="{{ student_max_borrow_days }}" value="{{ student_default_borrow_days }}">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="permission-preset">Berechtigungs-Preset</label>
|
<label for="permission-preset">Berechtigungs-Preset</label>
|
||||||
<select id="permission-preset" name="permission_preset" class="form-select">
|
<select id="permission-preset" name="permission_preset" class="form-select">
|
||||||
@@ -561,25 +540,6 @@ document.addEventListener('DOMContentLoaded', function () {
|
|||||||
passwordInput.addEventListener('blur', updatePasswordRules);
|
passwordInput.addEventListener('blur', updatePasswordRules);
|
||||||
updatePasswordRules();
|
updatePasswordRules();
|
||||||
}
|
}
|
||||||
|
|
||||||
{% if student_cards_module_enabled %}
|
|
||||||
const studentCheckbox = document.getElementById('is-student');
|
|
||||||
const studentFields = document.getElementById('student-fields');
|
|
||||||
const studentCardInput = document.getElementById('student-card-id');
|
|
||||||
|
|
||||||
if (!studentCheckbox || !studentFields || !studentCardInput) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
function toggleStudentFields() {
|
|
||||||
const isChecked = studentCheckbox.checked;
|
|
||||||
studentFields.style.display = isChecked ? 'block' : 'none';
|
|
||||||
studentCardInput.required = isChecked;
|
|
||||||
}
|
|
||||||
|
|
||||||
studentCheckbox.addEventListener('change', toggleStudentFields);
|
|
||||||
toggleStudentFields();
|
|
||||||
{% endif %}
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
Reference in New Issue
Block a user