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

delete hook (#1032)

Browse Source 
* make log_message optional in delete_device

* add hooks support to delete job

* make delete job high prio

* web delete now queues job instead of inline delete

* move web logging into web package and remove userlog from device delete helper

* submit delete job for expire device instead of inline delete

* fixes to get web submit form for delete device to work

* enable delete hook functionality
This commit is contained in:
Oliver Gorwits
2023-04-30 22:58:42 +01:00
committed by GitHub
parent d338c2d15a
commit 949aeb9eea
9 changed files with 84 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,9 +51,9 @@
</ul>
</blockquote>
<textarea id="nd_devdel-log" class="input-block-level" rows="2" data-form="delete"
placeholder="Enter a log message" name="log"></textarea>
placeholder="Enter a log message" name="extra"></textarea>
<label class="checkbox" style="display: block">
<input id="nd_devdel-archive" type="checkbox" data-form="delete" name="archive">
<input id="nd_devdel-archive" type="checkbox" data-form="delete" name="port">
<h4 class="nd_unbolden">Archive Nodes</h4>
</label>
<input type="hidden" data-form="delete" value="[% row.ip | html_entity %]" name="device"/>

4
share/views/ajax/device/details.tt
View File

@@ -243,9 +243,9 @@
</ul>
</blockquote>
<textarea id="nd_devdel-log" class="input-block-level" rows="2" data-form="delete"
placeholder="Enter a log message" name="log"></textarea>
placeholder="Enter a log message" name="extra"></textarea>
<label class="checkbox">
<input id="nd_devdel-archive" type="checkbox" data-form="delete" name="archive">
<input id="nd_devdel-archive" type="checkbox" data-form="delete" name="port">
<h4 class="nd_unbolden">Archive Nodes</h4>
</label>
<input type="hidden" data-form="delete" value="[% d.ip | html_entity %]" name="device"/>

2
share/views/js/device.js
View File

@@ -176,7 +176,7 @@
}
}
else {
toastr.success('Deleted device '+ tr.data('for-device'));
toastr.success('Queued job to delete '+ tr.data('for-device'));
}
}
// skip any error reporting for now