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

Cipboard copy of device IP from Job Queue, Err jobs link to Discover form

Browse Source
This commit is contained in:
Oliver Gorwits
2014-03-02 20:55:13 +00:00
parent 0448f16d7c
commit 391b658ed1
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Netdisco/Changes
View File

@@ -5,6 +5,8 @@
* Wildcard support on Device Port MAC Search * Wildcard support on Device Port MAC Search
* Wildcard support on Node name/MAC Search * Wildcard support on Node name/MAC Search
* User Reports appear in "My Reports" menu if no category is given * User Reports appear in "My Reports" menu if no category is given
* Permit clipboard copy of device IP from Job Queue rows
* Failed Job Device IPs link to Discover form with pre-filled Discover IP
2.024003 - 2014-02-27 2.024003 - 2014-02-27

9
Netdisco/share/views/ajax/admintask/jobqueue.tt
View File

@@ -35,8 +35,13 @@
[% ELSE %] [% ELSE %]
<td class="nd_center-cell">[% row.status.ucfirst | html_entity %]</td> <td class="nd_center-cell">[% row.status.ucfirst | html_entity %]</td>
[% END %] [% END %]
<td class="nd_center-cell"><a class="nd_linkcell" <td class="nd_center-cell">
href="[% uri_for('/device') %]?q=[% row.device | uri %]">[% row.device | html_entity %]</a></td> [% IF row.status == 'error' %]
<a href="[% uri_for('/') %]?device=[% row.device | uri %]">[% row.device | html_entity %]</a>
[% ELSE %]
<a href="[% uri_for('/device') %]?q=[% row.device | uri %]">[% row.device | html_entity %]</a>
[% END %]
</td>
<td class="nd_center-cell">[% row.port | html_entity %]</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.subaction | html_entity %]</td>
<td class="nd_center-cell">[% row.username | html_entity %]</td> <td class="nd_center-cell">[% row.username | html_entity %]</td>

2
Netdisco/share/views/index.tt
View File

@@ -50,7 +50,7 @@
[% IF user_has_role('admin') %] [% IF user_has_role('admin') %]
<form class="nd_login-form" method="post" action="[% uri_for('/admin/discover') %]"> <form class="nd_login-form" method="post" action="[% uri_for('/admin/discover') %]">
<div class="form-horizontal"> <div class="form-horizontal">
<input placeholder="Device hostname or IP" class="span4" name="device" type="text"/> <input placeholder="Device hostname or IP" class="span4" name="device" value="[% params.device %]" type="text"/>
<input type="hidden" name="extra" value="with-nodes"/> <input type="hidden" name="extra" value="with-nodes"/>
<button type="submit" class="btn btn-info">Discover</button> <button type="submit" class="btn btn-info">Discover</button>
</div> </div>