Papierkorb: eigener globaler Bereich unter Einstellungen (view+edit)
Vorher: Sichtbarkeit einer Papierkorb-Sektion war an das jeweilige Ressourcen-Leserecht gekoppelt (devices.view fuer Clients-Sektion usw.), Wiederherstellen/endgueltig Loeschen an das jeweilige Ressourcen- Bearbeiten-Recht (switches.edit fuer Switche im Papierkorb usw.). Jetzt: papierkorb.view/papierkorb.edit als eigenstaendiges Rechtepaar unter Einstellungen (vorher unter Geraete einsortiert), komplett losgeloest von den einzelnen Ressourcen-Rechten: - papierkorb.view zeigt ALLE fuenf Kategorien auf einmal, unabhaengig davon, ob der Benutzer die jeweilige aktive Ressource sehen darf. - papierkorb.edit erlaubt Wiederherstellen/endgueltig Loeschen JEDER Kategorie, unabhaengig vom sonstigen Bearbeiten-Recht der jeweiligen Ressource (z.B. switches.edit gewaehrt jetzt KEINEN Zugriff mehr auf Switche im Papierkorb). Live auf POETEST mit zwei eigens angelegten Testgruppen verifiziert: ein Nutzer mit switches.edit (aber ohne papierkorb.edit) kann einen Switch im Papierkorb nachweislich NICHT wiederherstellen (deleted_at unveraendert vor/nach dem Versuch); ein Nutzer mit papierkorb.edit (aber ohne switches.edit) kann es.
This commit is contained in:
@@ -19,7 +19,6 @@
|
||||
|
||||
<div style="display:flex; flex-direction:column; gap:16px;">
|
||||
|
||||
{% if current_user.has_permission('devices.view') %}
|
||||
<div class="card card-pad">
|
||||
<h3 style="font-size:14px; margin:0 0 12px;">Clients ({{ trash.devices|length }})</h3>
|
||||
{% if trash.devices %}
|
||||
@@ -33,7 +32,7 @@
|
||||
<td class="mono">{{ d['ip'] }}</td>
|
||||
<td class="text-faint" style="font-size:12px;">{{ d['deleted_at'] }}</td>
|
||||
<td>
|
||||
{% if current_user.has_permission('devices.edit') %}
|
||||
{% if current_user.has_permission('papierkorb.edit') %}
|
||||
<div class="row-actions">
|
||||
<form method="post" action="{{ url_for('restore_device', mac=d['mac']) }}">
|
||||
<button type="submit" class="btn btn-sm btn-secondary">Wiederherstellen</button>
|
||||
@@ -55,9 +54,7 @@
|
||||
<p class="text-faint" style="font-size:12px;">Papierkorb ist leer.</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if current_user.has_permission('switches.view') %}
|
||||
<div class="card card-pad">
|
||||
<h3 style="font-size:14px; margin:0 0 12px;">Switche ({{ trash.switches|length }})</h3>
|
||||
{% if trash.switches %}
|
||||
@@ -71,7 +68,7 @@
|
||||
<td class="mono">{{ s['ip'] }}</td>
|
||||
<td class="text-faint" style="font-size:12px;">{{ s['deleted_at'] }}</td>
|
||||
<td>
|
||||
{% if current_user.has_permission('switches.edit') %}
|
||||
{% if current_user.has_permission('papierkorb.edit') %}
|
||||
<div class="row-actions">
|
||||
<form method="post" action="{{ url_for('restore_switch', hostname=s['hostname']) }}">
|
||||
<button type="submit" class="btn btn-sm btn-secondary">Wiederherstellen</button>
|
||||
@@ -93,9 +90,7 @@
|
||||
<p class="text-faint" style="font-size:12px;">Papierkorb ist leer.</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if current_user.has_permission('credentials.view') %}
|
||||
<div class="card card-pad">
|
||||
<h3 style="font-size:14px; margin:0 0 12px;">Zugangsdaten ({{ trash.credentials|length }})</h3>
|
||||
{% if trash.credentials %}
|
||||
@@ -109,7 +104,7 @@
|
||||
<td class="mono">{{ c['username'] }}</td>
|
||||
<td class="text-faint" style="font-size:12px;">{{ c['deleted_at'] }}</td>
|
||||
<td>
|
||||
{% if current_user.has_permission('credentials.edit') %}
|
||||
{% if current_user.has_permission('papierkorb.edit') %}
|
||||
<div class="row-actions">
|
||||
<form method="post" action="{{ url_for('restore_credential', cred_id=c['id']) }}">
|
||||
<button type="submit" class="btn btn-sm btn-secondary">Wiederherstellen</button>
|
||||
@@ -131,9 +126,7 @@
|
||||
<p class="text-faint" style="font-size:12px;">Papierkorb ist leer.</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if current_user.has_permission('users.view') %}
|
||||
<div class="card card-pad">
|
||||
<h3 style="font-size:14px; margin:0 0 12px;">Benutzer ({{ trash.users|length }})</h3>
|
||||
{% if trash.users %}
|
||||
@@ -148,7 +141,7 @@
|
||||
<td class="text-dim">{{ full_name or '—' }}</td>
|
||||
<td class="text-faint" style="font-size:12px;">{{ u['deleted_at'] }}</td>
|
||||
<td>
|
||||
{% if current_user.has_permission('users.edit') %}
|
||||
{% if current_user.has_permission('papierkorb.edit') %}
|
||||
<div class="row-actions">
|
||||
<form method="post" action="{{ url_for('restore_user', user_id=u['id']) }}">
|
||||
<button type="submit" class="btn btn-sm btn-secondary">Wiederherstellen</button>
|
||||
@@ -170,9 +163,7 @@
|
||||
<p class="text-faint" style="font-size:12px;">Papierkorb ist leer.</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if current_user.has_permission('groups.view') %}
|
||||
<div class="card card-pad">
|
||||
<h3 style="font-size:14px; margin:0 0 12px;">Gruppen ({{ trash.groups|length }})</h3>
|
||||
{% if trash.groups %}
|
||||
@@ -185,7 +176,7 @@
|
||||
<td class="cell-name">{{ g['name'] }}</td>
|
||||
<td class="text-faint" style="font-size:12px;">{{ g['deleted_at'] }}</td>
|
||||
<td>
|
||||
{% if current_user.has_permission('groups.edit') %}
|
||||
{% if current_user.has_permission('papierkorb.edit') %}
|
||||
<div class="row-actions">
|
||||
<form method="post" action="{{ url_for('restore_group', group_id=g['id']) }}">
|
||||
<button type="submit" class="btn btn-sm btn-secondary">Wiederherstellen</button>
|
||||
@@ -207,7 +198,6 @@
|
||||
<p class="text-faint" style="font-size:12px;">Papierkorb ist leer.</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user