Testressource Checkbox Fix

Dieser Commit ist enthalten in:
2025-06-15 22:33:36 +02:00
Ursprung d65e5d333c
Commit b18fb495be
2 geänderte Dateien mit 32 neuen und 7 gelöschten Zeilen

Datei anzeigen

@@ -4240,7 +4240,13 @@ def quarantine_resource(resource_id):
additional_info=f"Ressource {resource[0]}: {resource[1]} in Quarantäne") additional_info=f"Ressource {resource[0]}: {resource[1]} in Quarantäne")
flash('Ressource in Quarantäne gesetzt', 'success') flash('Ressource in Quarantäne gesetzt', 'success')
return redirect(url_for('resources'))
# Redirect mit allen aktuellen Filtern
return redirect(url_for('resources',
show_test=request.args.get('show_test', request.form.get('show_test', 'false')),
type=request.args.get('type', request.form.get('type', '')),
status=request.args.get('status', request.form.get('status', '')),
search=request.args.get('search', request.form.get('search', ''))))
@app.route('/resources/release', methods=['POST']) @app.route('/resources/release', methods=['POST'])
@login_required @login_required
@@ -4285,7 +4291,13 @@ def release_resources():
additional_info=f"{released} Ressourcen aus Quarantäne freigegeben") additional_info=f"{released} Ressourcen aus Quarantäne freigegeben")
flash(f'{released} Ressourcen freigegeben', 'success') flash(f'{released} Ressourcen freigegeben', 'success')
return redirect(url_for('resources'))
# Redirect mit allen aktuellen Filtern
return redirect(url_for('resources',
show_test=request.args.get('show_test', request.form.get('show_test', 'false')),
type=request.args.get('type', request.form.get('type', '')),
status=request.args.get('status', request.form.get('status', '')),
search=request.args.get('search', request.form.get('search', ''))))
@app.route('/api/resources/allocate', methods=['POST']) @app.route('/api/resources/allocate', methods=['POST'])
@login_required @login_required

Datei anzeigen

@@ -427,9 +427,10 @@
<td class="text-center"> <td class="text-center">
{% if resource[3] == 'quarantine' %} {% if resource[3] == 'quarantine' %}
<!-- Quick Action für Quarantäne --> <!-- Quick Action für Quarantäne -->
<form method="post" action="/resources/release" <form method="post" action="/resources/release?show_test={{ show_test }}&type={{ resource_type }}&status={{ status_filter }}&search={{ search }}"
style="display: inline-block; margin-right: 5px;"> style="display: inline-block; margin-right: 5px;">
<input type="hidden" name="resource_ids[]" value="{{ resource[0] }}"> <input type="hidden" name="resource_ids" value="{{ resource[0] }}">
<input type="hidden" name="show_test" value="{{ show_test }}">
<button type="submit" <button type="submit"
class="btn btn-sm btn-success"> class="btn btn-sm btn-success">
<i class="bi bi-check-circle"></i> Freigeben <i class="bi bi-check-circle"></i> Freigeben
@@ -486,9 +487,10 @@
{% elif resource[3] == 'quarantine' %} {% elif resource[3] == 'quarantine' %}
<!-- Aktionen für Quarantäne-Ressourcen --> <!-- Aktionen für Quarantäne-Ressourcen -->
<li> <li>
<form method="post" action="/resources/release" <form method="post" action="/resources/release?show_test={{ show_test }}&type={{ resource_type }}&status={{ status_filter }}&search={{ search }}"
style="display: contents;"> style="display: contents;">
<input type="hidden" name="resource_ids[]" value="{{ resource[0] }}"> <input type="hidden" name="resource_ids" value="{{ resource[0] }}">
<input type="hidden" name="show_test" value="{{ show_test }}">
<button type="submit" class="dropdown-item"> <button type="submit" class="dropdown-item">
<i class="bi bi-check-circle text-success"></i> Ressource freigeben <i class="bi bi-check-circle text-success"></i> Ressource freigeben
</button> </button>
@@ -624,6 +626,12 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<form method="post" id="quarantineForm"> <form method="post" id="quarantineForm">
<!-- Filter-Parameter als Hidden Fields -->
<input type="hidden" name="show_test" value="{{ show_test }}">
<input type="hidden" name="type" value="{{ resource_type }}">
<input type="hidden" name="status" value="{{ status_filter }}">
<input type="hidden" name="search" value="{{ search }}">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title">⚠️ Ressource in Quarantäne setzen</h5> <h5 class="modal-title">⚠️ Ressource in Quarantäne setzen</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
@@ -734,7 +742,12 @@ function showQuarantineModal(resourceId) {
const modalElement = document.getElementById('quarantineModal'); const modalElement = document.getElementById('quarantineModal');
const modal = new bootstrap.Modal(modalElement); const modal = new bootstrap.Modal(modalElement);
const form = modalElement.querySelector('form'); const form = modalElement.querySelector('form');
form.setAttribute('action', `/resources/quarantine/${resourceId}`);
// URL mit aktuellen Filtern
const currentUrl = new URL(window.location);
const params = new URLSearchParams(currentUrl.search);
form.setAttribute('action', `/resources/quarantine/${resourceId}?${params.toString()}`);
modal.show(); modal.show();
} }