partial fix for KTS-484.

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5715 c91229c3-7414-0410-bfa2-8a42b809f60b

partial fix for KTS-484.
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5715 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent d033d781
Showing 8 changed files with 71 additions and 15 deletions
docs/VERSION.txt
lib/documentmanagement/Document.inc
lib/documentmanagement/documentcore.inc.php
lib/documentmanagement/documentutil.inc.php
plugins/ktcore/admin/deletedDocuments.php
sql/mysql/upgrade/3.0.3.6/document-restore.sql
templates/ktcore/document/admin/deletedlist.smarty
templates/ktcore/document/admin/restoreconfirmlist.smarty
-3.0.3.5
+3.0.3.6
@@ -94,6 +94,13 @@ class Document {
     function getImmutable() { return $this->_oDocumentCore->getImmutable(); }
     function setImmutable($mValue) { $this->_oDocumentCore->setImmutable($mValue); }
+    function getRestoreFolderId() { return $this->_oDocumentCore->getRestoreFolderId(); }
+    function setRestoreFolderId($iValue) { $this->_oDocumentCore->setRestoreFolderId($iValue); }    
+
+    function getRestoreFolderPath() { return $this->_oDocumentCore->getRestoreFolderPath(); }
+    function setRestoreFolderPath($sValue) { $this->_oDocumentCore->setRestoreFolderPath($sValue); }    
+    
+    
     // Document Metadata Items
     function getDocumentTypeID() { return $this->_oDocumentMetadataVersion->getDocumentTypeId(); }
@@ -443,6 +450,8 @@ class Document {
             "Modified",
             "FolderId", 
             "StatusId",
+            "RestoreFolderId",            
+            "RestoreFolderPath",
         );
         $aCore = array();
@@ -67,6 +67,9 @@ class KTDocumentCore extends KTEntity {
     var $bIsCheckedOut;
     var $iCheckedOutUserId;
+    
+    var $iRestoreFolderId;
+    var $sRestoreFolderPath;
     var $_aFieldToSelect = array(
         "iId" => "id",
@@ -95,6 +98,10 @@ class KTDocumentCore extends KTEntity {
         "iPermissionObjectId" => 'permission_object_id',
         "iPermissionLookupId" => 'permission_lookup_id',
         "iOwnerId" => 'owner_id',
+        
+        // restore-related
+        'iRestoreFolderId' => 'restore_folder_id',
+        'sRestoreFolderPath' => 'restore_folder_path',
     );
     function KTDocument() {
@@ -136,6 +143,12 @@ class KTDocumentCore extends KTEntity {
     function getImmutable() { return $this->bImmutable; }
     function setImmutable($mValue) { $this->bImmutable = $mValue; }
+    
+    function getRestoreFolderId() { return $this->iRestoreFolderId; }
+    function setRestoreFolderId($iValue) { $this->iRestoreFolderId = $iValue; }    
+
+    function getRestoreFolderPath() { return $this->sRestoreFolderPath; }
+    function setRestoreFolderPath($sValue) { $this->sRestoreFolderPath = $sValue; }    
     // }}}
     // {{{ getParentId
@@ -234,7 +247,9 @@ class KTDocumentCore extends KTEntity {
     // {{{ update
     function update($bPathMove = false) {
+        //var_dump($this); exit(0);    
         $res = parent::update();
+
         if (($res === true) && ($bPathMove === true)) {
             KTPermissionUtil::updatePermissionLookup($this);
         }
@@ -621,7 +621,9 @@ class KTDocumentUtil {
     // {{{ delete
     function delete($oDocument, $sReason, $iDestFolderId = null) {
         $oDocument =& KTUtil::getObject('Document', $oDocument);
-        if (is_null($iDestFolderId)) { $iDestFolderId = $oDocument->getFolderID(); }
+        if (is_null($iDestFolderId)) { 
+            $iDestFolderId = $oDocument->getFolderID(); 
+        }
         $oStorageManager =& KTStorageManagerUtil::getSingleton();
         global $default;
@@ -629,24 +631,34 @@ class KTDocumentUtil {
         if (count(trim($sReason)) == 0) { 
             return PEAR::raiseError('Deletion requires a reason'); 
         }
-        if (PEAR::isError($oDocument) || ($oDocument == false)) { return PEAR::raiseError('Invalid document object.'); }
-        if ($oDocument->getIsCheckedOut() == true) { return PEAR::raiseError(sprintf(_kt('The document is checked out and cannot be deleted: %s'), $oDocument->getName())); }
+        if (PEAR::isError($oDocument) || ($oDocument == false)) { 
+            return PEAR::raiseError('Invalid document object.'); 
+        }
+        
+        if ($oDocument->getIsCheckedOut() == true) { 
+            return PEAR::raiseError(sprintf(_kt('The document is checked out and cannot be deleted: %s'), $oDocument->getName())); 
+        }
         // IF we're deleted ...
-        if ($oDocument->getStatusID() == DELETED) { return true; }
-
-
-	$oOrigFolder = Folder::get($oDocument->getFolderId());
-	
+        if ($oDocument->getStatusID() == DELETED) { 
+            return true; 
+        }
+        $oOrigFolder = Folder::get($oDocument->getFolderId());
+
         DBUtil::startTransaction();
-                // flip the status id
+        // flip the status id
         $oDocument->setStatusID(DELETED);
-        $oDocument->setFolderID($iDestFolderId); // try to keep it in _this_ folder, otherwise move to root.
+        
+        // $iDestFolderId is DEPRECATED.
+        $oDocument->setFolderID(null); 
+        $oDocument->setRestoreFolderId($oOrigFolder->getId());
+        $oDocument->setRestoreFolderPath(Folder::generateFolderIDs($oOrigFolder->getId()));
         $res = $oDocument->update();
+        
         if (PEAR::isError($res) || ($res == false)) {
             DBUtil::rollback();
             return PEAR::raiseError(_kt("There was a problem deleting the document from the database."));
@@ -198,10 +198,10 @@ var $sHelpPage = &#39;ktcore/admin/deleted documents.html&#39;;
         $oStorage =& KTStorageManagerUtil::getSingleton();
         foreach ($aDocuments as $oDoc) {
-            $oFolder = Folder::get($oDoc->getFolderID());
+            $oFolder = Folder::get($oDoc->getRestoreFolderId());
             if (PEAR::isError($oFolder)) { $oDoc->setFolderId(1); $oDoc->update(); } // move to root if parent no longer exists.
             if ($oStorage->restore($oDoc)) {
-		$oDoc = Document::get($oDoc->getId()); // storage path has changed for most recent object...
+                $oDoc = Document::get($oDoc->getId()); // storage path has changed for most recent object...
                 $oDoc->setStatusId(LIVE);
                 $res = $oDoc->update();
                 if (PEAR::isError($res) || ($res == false)) {
@@ -233,6 +233,21 @@ var $sHelpPage = &#39;ktcore/admin/deleted documents.html&#39;;
         $this->successRedirectToMain($msg);
     }    
+    function getRestoreLocationFor($oDocument) {
+        $iFolderId = $oDocument->getRestoreFolderId();    
+        $oFolder = Folder::get($iFolderId);
+        
+        if (PEAR::isError($oFolder)) {
+            return _kt('Original folder no longer exists.  Document will be restored in the root folder.'); 
+        } else {
+            $aCrumbs = KTBrowseUtil::breadcrumbsForFolder($oFolder);
+            $aParts = array();
+            foreach ($aCrumbs as $aInfo) {
+                $aParts[] = $aInfo['name'];
+            }
+            return implode(' &raquo; ', $aParts);
+        }
+    }
 }
 ?>
+ALTER TABLE `documents` ADD `restore_folder_id` INT(11);
+ALTER TABLE `documents` ADD `restore_folder_path` text;
+ALTER TABLE `documents` CHANGE `folder_id` `folder_id` int(11),
 \ No newline at end of file
@@ -23,7 +23,7 @@ can &lt;strong&gt;restore&lt;/strong&gt; them as necessary.{/i18n}&lt;/p&gt;
     <tr>
       <th style="width:2em"><input type="checkbox" onclick="toggleSelectFor(this, 'selected_docs')" title="toggle all"/></th>
       <th>{i18n}Document Name{/i18n}</th>
-      <th>{i18n}Document Path{/i18n}</th>
+{*      <th>{i18n}Document Path{/i18n}</th> *}
       <th>{i18n}Last Modification{/i18n}</th>
       <th>{i18n}Deletion Comment{/i18n}</th>
     </tr>
@@ -33,7 +33,7 @@ can &lt;strong&gt;restore&lt;/strong&gt; them as necessary.{/i18n}&lt;/p&gt;
     <tr>
       <td><input type="checkbox" name="selected_docs[]" value="{$oDoc->getId()}"/></td>
       <td>{$oDoc->getName()}</td>
-      <td>{getCrumbStringForDocument document=$oDoc}</td>
+{*      <td>{getCrumbStringForDocument document=$oDoc}</td> *}
       <td>{$oDoc->getLastModifiedDate()}</td>
       <td>{$oDoc->getLastDeletionComment()}</td>
     </tr>
@@ -14,12 +14,14 @@ confirm that you want to restore these documents.{/i18n}&lt;/p&gt;&lt;/div&gt;
     <tr>
       <th>{i18n}Document Name{/i18n}</th>
+      <th>{i18n}Restore To{/i18n}</th>      
     </tr>
   </thead>
   <tbody>
     {foreach item=oDoc from=$documents}
     <tr>
       <td>{$oDoc->getName()}<input type="hidden" name="selected_docs[]" value="{$oDoc->getId()}" /></td>
+      <td>{$context->getRestoreLocationFor($oDoc)}</td>      
     </tr>
     {/foreach}
   </tbody>