r4268 ability to delete a file entity from the Edit tab of the File page

deleteFile: changed success message from 'updated' to 'deleted' when deleting file
renderFileProperties: added link to delete file op

diff --git a/ChangeLog b/ChangeLog
index ac01626c2e1b91248fbfc26544aca35449eb3f2a..867e878029647cb958dea60725350ffaebfa1439 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
        bugfix: Permissions code editor was broken with Google Chrome
        update: new DB table indexes speeding up IP tree operations
        update: tolerate user-visible newlines in secret.php and local.php
+       update: ability to delete a file entity from the Edit tab of the File page
 0.19.1 2011-02-22
        update: UI: rack lists are now reduced by common tags with object on Rackspace tab (FILTER_RACKLIST_BY_TAGS config var)
        update: 802.1q: If switch has IP interface in some VLAN linked to IP subnet, this VLAN is not pruned from switch's uplink

diff --git a/wwwroot/inc/interface.php b/wwwroot/inc/interface.php
index 16760c9fda9b0d479911f7f964b49e2008484c80..ee73a3d1b20687395e17af0bd4ece3adb718c4bf 100644 (file)
--- a/wwwroot/inc/interface.php
+++ b/wwwroot/inc/interface.php
@@ -6714,6 +6714,12 @@ function renderFileProperties ($file_id)
        echo htmlspecialchars ($file['name']) . "'></td></tr>\n";
        echo "<tr><th class=tdright>Comment:</th><td class=tdleft><textarea tabindex=103 name=file_comment rows=10 cols=80>\n";
        echo htmlspecialchars ($file['comment']) . "</textarea></td></tr>\n";
+       echo "<tr><th class=tdright>Actions:</th><td class=tdleft>";
+       echo "<a href='".
+               makeHrefProcess (array ('op'=>'deleteFile', 'page'=>'files', 'tab'=>'manage', 'file_id'=>$file_id)).
+               "' onclick=\"javascript:return confirm('Are you sure you want to delete the file?')\">" .
+               getImageHREF ('destroy', 'Delete file') . "</a>";
+       echo '</td></tr>';
        echo "<tr><th class=submit colspan=2>";
        printImageHREF ('SAVE', 'Save changes', TRUE, 102);
        echo '</th></tr></form></table>';

diff --git a/wwwroot/inc/ophandlers.php b/wwwroot/inc/ophandlers.php
index fff54da86df8f7881a84ae99a6b199bb14163134..935990c20715a516d9ed5952ca9a1160cdf40313 100644 (file)
--- a/wwwroot/inc/ophandlers.php
+++ b/wwwroot/inc/ophandlers.php
@@ -2193,7 +2193,7 @@ function unlinkFile ()
        return buildRedirectURL (__FUNCTION__, commitUnlinkFile ($_REQUEST['link_id']) === FALSE ? 'ERR' : 'OK');
 }
 
-$msgcode['deleteFile']['OK'] = 6;
+$msgcode['deleteFile']['OK'] = 7;
 function deleteFile ()
 {
        assertUIntArg ('file_id');