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

fix bugs with Pseudo and Duplicate Device delete (causing web crash)

Browse Source
This commit is contained in:
Oliver Gorwits
2017-07-12 06:59:53 +01:00
parent 650086f97e
commit 070d595ef2
6 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/views/ajax/admintask/duplicatedevices.tt
View File

@@ -56,7 +56,7 @@
<input id="nd_devdel-archive" type="checkbox" data-form="delete" name="archive">
<h4 class="nd_unbolden">Archive Nodes</h4>
</label>
<input type="hidden" data-form="delete" value="[% row.ip | html_entity %]" name="ip"/>
<input type="hidden" data-form="delete" value="[% row.ip | html_entity %]" name="device"/>
</div>
<div class="modal-footer">
<button class="btn btn-success" data-dismiss="modal" aria-hidden="true">Cancel</button>

6
share/views/ajax/admintask/pseudodevice.tt
View File

@@ -45,13 +45,11 @@
<p class="text-info">
Pseudo-device &quot;[% row.dns | html_entity %] / [% row.ip | html_entity %]&quot; will be deleted.</p>
</blockquote>
<input data-form="del" name="dns" type="hidden" value="[% row.dns | html_entity %]">
<input data-form="del" name="ip" type="hidden" value="[% row.ip | html_entity %]">
<input data-form="del" name="ports" type="hidden" value="[% row.port_count | html_entity %]">
<input data-form="delete" name="device" type="hidden" value="[% row.ip | html_entity %]">
</div>
<div class="modal-footer">
<button class="btn btn-success" data-dismiss="modal" aria-hidden="true">Cancel</button>
<button class="btn btn-danger nd_adminbutton" name="del" data-dismiss="modal">Confirm</button>
<button class="btn btn-danger nd_adminbutton" name="delete" data-dismiss="modal">Confirm</button>
</div>
</div>
</td>