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

initial implementatin of new job queue with skip info per job

Browse Source
This commit is contained in:
Oliver Gorwits
2018-04-25 21:43:39 +01:00
parent 5eb443438c
commit 7e1982985c
9 changed files with 187 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/public/css/netdisco.css
View File

@@ -454,6 +454,10 @@ td > form.nd_inline-form {
.tooltip-wrapper .input[disabled] {
pointer-events: none;
}
.tooltip-inner {
max-width: none;
white-space: nowrap;
}
/* vlan entry box for netmap */
#nd_vlan-label {

6
share/views/admintask.tt
View File

@@ -30,10 +30,10 @@
href="#[% task.tag %]_pane">[% task.label %]</a></li>
[% IF task.tag == 'jobqueue' %]
<span id="nd_device-name">
<a class="nd_adminbutton" name="delall" href="#"><i class="icon-trash text-error"></i></a>
<a id="nd_countdown-refresh" href="#"><i class="text-success icon-refresh"></i></a>
<a class="nd_adminbutton" name="delall" href="#"><i class="icon-trash icon-large text-error"></i></a>
<a id="nd_countdown-refresh" href="#"><i class="text-success icon-large icon-refresh"></i></a>
<a id="nd_countdown-control" href="#">
<i id="nd_countdown-control-icon" class="text-success icon-play"></i></a>
<i id="nd_countdown-control-icon" class="text-success icon-large icon-play"></i></a>
<span id="nd_countdown"></span>
</span>
[% ELSIF task.tag == 'userlog' %]

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

@@ -5,14 +5,12 @@
<thead>
<tr>
<th class="nd_center-cell">Entered</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">Device</th>
<th class="nd_center-cell">Parameters</th>
<th class="nd_center-cell">Status</th>
<th class="nd_center-cell">Duration</th>
<th class="nd_center-cell">Action</th>
</tr>
</thead>
@@ -25,16 +23,12 @@
data-content="<pre>[% row.log | html_entity %]</pre>"
>
<td class="nd_center-cell">[% row.entered_stamp | html_entity %]</td>
<td class="nd_center-cell">[% row.username | html_entity %]</td>
<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('/') %]?device=[% row.device | uri %]">[% row.device | html_entity %]</a>
@@ -42,11 +36,29 @@
<a href="[% uri_for('/device') %]?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>
<td class="nd_center-cell">[% row.port | html_entity %][% ', ' IF row.port AND row.subaction %][% row.subaction | html_entity %]</td>
[% IF row.status.search('^queued-') %]
<td class="nd_center-cell">Running on &quot;[% row.status.remove('^queued-') | html_entity %]&quot;</td>
[% ELSIF row.status == 'queued' %]
<td class="nd_center-cell">
<i class="icon-ban-circle icon-large [% row.qstat.badacl ? 'text-error' : 'text-success' %]"
rel="tooltip" data-placement="bottom" data-offset="5" data-title="[% row.qstat.acl.join('<br>') %]"
data-container="body" data-html="true"></i>
&nbsp;
<i class="icon-time icon-large [% row.qstat.last_defer ? 'text-error' : 'text-success' %]"
rel="tooltip" data-placement="bottom" data-offset="5" data-title="[% row.qstat.next.join('<br>') %]"
data-container="body" data-html="true"></i>
&nbsp;
<i class="icon-bolt icon-large [% row.qstat.last_defer ? 'text-error' : 'text-success' %]"
rel="tooltip" data-placement="bottom" data-offset="5" data-title="[% row.qstat.fails.join('<br>') %]"
data-container="body" data-html="true"></i>
</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">
<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>

4
share/views/js/admintask.js
View File

@@ -71,8 +71,10 @@
,minLength: 0
});
// activate modals
// activate modals, tooltips and popovers
$('.nd_modal').modal({show: false});
$("[rel=tooltip]").tooltip({live: true});
$("[rel=popover]").popover({live: true});
}
// on load, establish global delegations for now and future