mgrotke/linuxrouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Development

Browse source
This commit is contained in:
Matthew Grotke 2026-06-03 16:04:51 -04:00
parent 8ab88094b3
commit 6ebf7027fd
4 changed files with 65 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

26
docker/routlin-dash/app/pages/actions/action.py
View file

@ -2,7 +2,7 @@ from pathlib import Path
from flask import Blueprint, request, redirect, flash, session
from auth import require_level
from config_utils import (flush_pending_to_queue, get_dashboard_pending,
revert_group, queued_msg,
revert_group, revert_group_chain, queued_msg,
DASHBOARD_PENDING, _db)
_PAGE = Path(__file__).parent.name
@ -37,17 +37,21 @@ def history_revert():
if not selected_uuids:
flash('No items selected.', 'info')
return redirect(f'/{_PAGE}')
succeeded, failed = 0, 0
for uuid in selected_uuids:
msg, ok = revert_group(uuid)
if ok:
succeeded += 1
else:
flash(msg, 'error')
failed += 1
if len(selected_uuids) != 1:
flash('Please select exactly one change to revert.', 'error')
return redirect(f'/{_PAGE}')
behavior = request.form.get('revert_behavior', 'revert_subsequent')
errors, succeeded, failed = revert_group_chain(selected_uuids[0])
for msg in errors:
flash(msg, 'error')
if succeeded:
plural = 's' if succeeded != 1 else ''
flash(f'{succeeded} change{plural} reverted.', 'success')
s = 's' if succeeded != 1 else ''
if behavior == 'restore_state':
flash(f'Config restored to selected state ({succeeded} change{s} reverted).', 'success')
else:
flash(f'{succeeded} change{s} reverted.', 'success')
return redirect(f'/{_PAGE}')

2
docker/routlin-dash/app/pages/actions/content.json
View file

@ -110,7 +110,7 @@
"items": [
{
"type": "raw_html",
"html": "<label style='display:flex;align-items:center;gap:0.5rem;margin:0;font-size:0.875rem'>Revert behavior:<select name='revert_behavior' class='form-select' style='width:auto'><option value='revert_subsequent'>Revert selected and subsequent tree changes</option><option value='restore_state'>Restore to tree selected state</option></select></label>"
"html": "<label style='display:flex;align-items:center;gap:0.5rem;margin:0;font-size:0.875rem;white-space:nowrap'>Revert behavior:<select name='revert_behavior' class='form-select' style='width:auto'><option value='revert_subsequent'>Revert selected and subsequent tree changes</option><option value='restore_state'>Restore tree to selected state</option></select></label>"
},
{
"type": "button_secondary",

14
docker/routlin-dash/app/pages/actions/view.py
View file

@ -66,11 +66,7 @@ def collect_tokens(cfg):
done_ts_map = get_done_timestamps()
if all_groups:
is_manager = client_level() >= LEVEL_RANK['manager']
no_revert = set()
for g, _ in all_groups:
if g['reverts_group']:
no_revert.add(g['uuid'])
no_revert.add(g['reverts_group'])
no_revert = {g['uuid'] for g, _ in all_groups if g['reverted'] or g['reverts_group']}
hist_rows = ''
hist_onclick = (
'onclick="if(event.target.type!==\'checkbox\')'
@ -91,7 +87,11 @@ def collect_tokens(cfg):
else:
verb = 'Edited'
item = g.get('item_value') or ''
summary = f'{verb} {g["parent_path"]}: {item}' if item else f'{verb} {g["parent_path"]}'
summary_text = f'{verb} {g["parent_path"]}: {item}' if item else f'{verb} {g["parent_path"]}'
if g['reverted']:
summary = f'<span style="text-decoration:line-through;opacity:0.5">{e(summary_text)}</span> <span class="badge badge-disabled">Superseded</span>'
else:
summary = e(summary_text)
snap_tag = (
f'<div class="tag-list"><span class="tag" data-tooltip="{e(uuid)}" data-uuid="{e(uuid)}">'
f'<span class="tl-full">{e(uuid[:8])}</span>'
@ -105,7 +105,7 @@ def collect_tokens(cfg):
f'<tr class="row-expandable" data-uuid="{e(uuid)}" {hist_onclick}>'
f'<td class="table-cell"><input type="checkbox" name="selected_uuids" value="{e(uuid)}" {cb_attrs}/></td>'
f'<td class="table-cell">{e(dt_str)}</td>'
f'<td class="table-cell">{e(summary)}</td>'
f'<td class="table-cell">{summary}</td>'
f'<td class="table-cell">{build_snap_val(changes)}</td>'
f'<td class="table-cell">{snap_tag}</td>'
f'<td class="table-cell">{snap_user}</td>'