diff options
author | Zach LeBar <zach@zachlebar.com> | 1980-02-08 22:06:51 +0000 |
---|---|---|
committer | Zach LeBar <zach@zachlebar.com> | 1980-02-08 22:06:51 +0000 |
commit | 82984dcb0b0495859e67662dc4a4f5a9ca83d1de (patch) | |
tree | 7a98f04c1fbec47fbd9db3ddc34ec3da12b7712b /provisioning-editdevice-html.lsp | |
parent | 454e50286e149cc056787173acec49920e632e1e (diff) | |
parent | c11f4f201fa92e73b0fd5953a49286b69586e239 (diff) | |
download | acf-provisioning-82984dcb0b0495859e67662dc4a4f5a9ca83d1de.tar.bz2 acf-provisioning-82984dcb0b0495859e67662dc4a4f5a9ca83d1de.tar.xz |
Fixing merge conflicts.
Diffstat (limited to 'provisioning-editdevice-html.lsp')
-rw-r--r-- | provisioning-editdevice-html.lsp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/provisioning-editdevice-html.lsp b/provisioning-editdevice-html.lsp index fddc888..a1292e0 100644 --- a/provisioning-editdevice-html.lsp +++ b/provisioning-editdevice-html.lsp @@ -16,7 +16,7 @@ require("htmlviewfunctions") <a href='<%= page_info.script..page_info.prefix..page_info.controller.."/editdeviceparams?device_id="..html.html_escape(form.value.device_id.value) %>'><img src='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/tango/16x16/actions/document-properties.png' title="Edit Parameters"></img> <big>Edit Parameters </big></a> <% end %> <% if viewlibrary.check_permission("deletedevice") then %> - <a href='<%= page_info.script..page_info.prefix..page_info.controller.."/deletedevice?device_id="..html.html_escape(form.value.device_id.value) %>' class="deletedevice"><img src='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/tango/16x16/emblems/emblem-unreadable.png' title="Delete this Device"></img> <big>Delete this Device </big></a> + <a href='<%= page_info.script..page_info.prefix..page_info.controller.."/deletedevice?submit=true&device_id="..html.html_escape(form.value.device_id.value) %>' class="deletedevice"><img src='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/tango/16x16/emblems/emblem-unreadable.png' title="Delete this Device"></img> <big>Delete this Device </big></a> <% end %> <% end %> |