135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

filtered web queue (#1113)

Browse Source 
implements #969 partially
This commit is contained in:
Oliver Gorwits
2023-10-24 18:29:48 +01:00
committed by GitHub
parent 6339017c7a
commit b1e253465a
10 changed files with 297 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
share/views/ajax/admintask/jobqueue.tt
View File

@@ -4,16 +4,14 @@
<table class="table table-bordered table-condensed table-hover nd_floatinghead">
<thead>
<tr>
<th class="nd_center-cell">Entered</th>
<th class="nd_center-cell">Backend</th>
<th class="nd_center-cell">Action</th>
<th class="nd_center-cell">Status</th>
<th class="nd_center-cell">Device</th>
<th class="nd_center-cell">Port</th>
<th class="nd_center-cell">Param</th>
<th class="nd_center-cell">User</th>
<th class="nd_center-cell">Started</th>
<th class="nd_center-cell">Finished</th>
<th class="nd_center-cell">Action</th>
<th class="nd_center-cell">Submitted By</th>
<th class="nd_center-cell">Status</th>
<th class="nd_center-cell">Duration</th>
<th class="nd_center-cell">Details</th>
<th class="nd_center-cell">Cancel</th>
</tr>
</thead>
<tbody>
@@ -24,17 +22,18 @@
[% ' class="nd_jobqueueitem info"' IF row.status.search('^queued-') %]
data-content="[% row.log | html_entity %]"
>
<td class="nd_center-cell">[% row.entered_stamp | html_entity %]</td>
[% IF row.status.search('^queued-') %]
<td class="nd_center-cell">[% row.status.remove('^queued-') | html_entity %]</td>
[% ELSE %]
<td class="nd_center-cell"></td>
[% END %]
<td class="nd_center-cell">
[% FOREACH word IN row.action.split('_') %]
[% word.ucfirst | html_entity %]&nbsp;
[% END %]
</td>
[% IF row.status.search('^queued-') %]
<td class="nd_center-cell">Running on &quot;[% row.status.remove('^queued-') | html_entity %]&quot;</td>
[% ELSE %]
<td class="nd_center-cell">[% row.status.ucfirst | html_entity %]</td>
[% END %]
<td class="nd_center-cell">
[% IF row.action == 'discover' AND row.status == 'error' %]
<a href="[% uri_for('/') | none %]?device=[% row.device | uri %]">[% row.device | html_entity %]</a>
@@ -42,16 +41,42 @@
<a href="[% uri_for('/device') | none %]?q=[% row.device | uri %]">[% row.target.dns || row.device | html_entity %]</a>
[% END %]
</td>
<td class="nd_center-cell">[% row.port | html_entity %]</td>
<td class="nd_center-cell">[% row.subaction | html_entity %]</td>
<td class="nd_center-cell">[% row.username | html_entity %]</td>
<td class="nd_center-cell">[% row.started_stamp | html_entity %]</td>
<td class="nd_center-cell">[% row.finished_stamp | html_entity %]</td>
[% IF row.status.search('^queued-') %]
<td class="nd_center-cell">Running</td>
[% ELSE %]
<td class="nd_center-cell">[% row.status.ucfirst | html_entity %]</td>
[% END %]
<td class="nd_center-cell">[% row.duration | html_entity %]</td>
<td class="nd_center-cell">
<button class="btn nd_jobqueue-extra" data-extra="nd_jobqueue_[% row.job | html_entity %]"><i class="icon-plus"></i></button>
</td>
<td class="nd_center-cell">
<input data-form="del" name="job" type="hidden" value="[% row.job | html_entity %]">
<button class="btn nd_adminbutton" name="del" type="submit"><i class="icon-trash text-error"></i></button>
</td>
</tr>
<tr id="nd_jobqueue_[% row.job | html_entity %]" class="nd_collapse-pre-hidden">
<td colspan="8">
<table>
<tr><td class="span2">ID</td><td> [% row.job | html_entity %] </td></tr>
<tr><td>Entered</td><td> [% row.entered_stamp | html_entity %] </td></tr>
<tr><td>Started</td><td> [% row.started_stamp | html_entity %] </td></tr>
<tr><td>Finished</td><td> [% row.finished_stamp | html_entity %] </td></tr>
<tr><td>Port</td><td> [% row.port | html_entity %] </td></tr>
<tr><td>Subaction</td><td> [% row.subaction | html_entity %] </td></tr>
<tr><td>User IP</td><td> [% row.userip | html_entity %] </td></tr>
<tr><td>Device Key</td><td> [% row.device_key | html_entity %] </td></tr>
<tr><td>Log</td><td> [% row.log | html_entity %] </td></tr>
</table>
</td>
</tr>
[% END %]
</tbody>
</table>