Fix for KTS-89: multi-way comparison support between documents.

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

Fix for KTS-89: multi-way comparison support between documents.
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4683 c91229c3-7414-0410-bfa2-8a42b809f60b
bshuttle
1 parent acf24f4f
Showing 3 changed files with 92 additions and 7 deletions
templates/kt3/document/metadata_history.smarty
templates/ktcore/document/comparison_version_select.smarty
view.php
@@ -10,7 +10,8 @@
                 <th class="username">{i18n}User{/i18n}</th>
                 <th class="date">{i18n}Metadata Version{/i18n}</th>
                 <th class="date">{i18n}Content Version{/i18n}</th>
-                <th class="compare">{i18n}Compare{/i18n}</th>
+                <th class="compare">{i18n}Compare with Current{/i18n}</th>
+                <th class="compare">{i18n}Compare with Other Version{/i18n}</th>
             </tr>
         </thead>
@@ -26,9 +27,10 @@
                 {if ($document->getMetadataVersion() == $oVersion->getMetadataVersion())}
                    <strong>{i18n}current version{/i18n}</strong>
                 {else}
-                   <a href="{$smarty.server.PHP_SELF}?action=viewComparison&fDocumentId={$document->getId()}&fComparisonVersion={$oVersion->getCurrentMetadataVersionId()}">{i18n}compare with current{/i18n}</a></td>                
+                   <a href="{$smarty.server.PHP_SELF}?action=viewComparison&fDocumentId={$document->getId()}&fBaseVersion={$oVersion->getMetadataVersionId()}&fComparisonVersion={$oVersion->getCurrentMetadataVersionId()}">{i18n}compare with current{/i18n}</a></td>                
                 {/if}
-                </td>                
+                </td>     
+                <td><a href="{$smarty.server.PHP_SELF}?action=startComparison&fDocumentId={$document->getId()}&fComparisonVersion={$oVersion->getCurrentMetadataVersionId()}">{i18n}compare with other version{/i18n}</a></td>
             </tr>
             {/foreach}
         </tbody>
+<h2>{i18n}Select Document Version to compare against{/i18n}</h2>
+
+<p class="descriptiveText">{i18n}This page lists versions of document metadata and allows you to compare a metadata version with the current metadata content.{/i18n}</p>
+
+    <table class="document_history" summary="{i18n}Document History for KnowledgeTree New UI Presentation{/i18n}" cellspacing="0">
+
+        <thead>
+            <tr>
+                <th class="username">{i18n}User{/i18n}</th>
+                <th class="date">{i18n}Metadata Version{/i18n}</th>
+                <th class="compare">{i18n}Compare{/i18n}</th>
+            </tr>
+        </thead>
+        <tbody>
+          {foreach item=oVersion from=$versions}
+            <tr class="{cycle options=even,odd}">
+                <td class="username">{$context->getUserForId($oVersion->getVersionCreatorId())}</td>
+                <td class="date">{$oVersion->getMetadataVersion()}</td>
+                <td class="compare">
+                {if ($document->getCurrentMetadataVersionId() == $oVersion->getCurrentMetadataVersionId())}
+                   <strong>{i18n}comparing against this version{/i18n}</strong>
+                {else}
+                   <a href="{$smarty.server.PHP_SELF}?action=viewComparison&fDocumentId={$document->getId()}&fBaseVersion={$document->getCurrentMetadataVersionId()}&fComparisonVersion={$oVersion->getCurrentMetadataVersionId()}">{i18n}compare{/i18n}</a>
+                {/if}
+                </td>
+            </tr>
+            {/foreach}
+        </tbody>
+        
+    </table>
@@ -255,7 +255,8 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
 	// this gets in:
 	//   fDocumentId (document to compare against)
 	//   fComparisonVersion (the metadata_version of the appropriate document)
-	function do_viewComparison() {	    
+	function do_viewComparison() {	 
+	    
 		$document_data = array();
 		$document_id = KTUtil::arrayGet($_REQUEST, 'fDocumentId');
 		if ($document_id === null) { 
@@ -264,10 +265,13 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
 		}
 		$document_data["document_id"] = $document_id;
+		
+		$base_version = KTUtil::arrayGet($_REQUEST, 'fBaseVersion');
+		
 		// try get the document.
-		$oDocument =& Document::get($document_id);
+		$oDocument =& Document::get($document_id, $base_version);
 		if (PEAR::isError($oDocument)) {
-		    $this->oPage->addError('The document you attempted to retrieve is invalid.   Please <a href="' . KTBrowseUtil::getBrowseBaseUrl() . '">browse</a> for one.');
+		    $this->oPage->addError('The base document you attempted to retrieve is invalid.   Please <a href="' . KTBrowseUtil::getBrowseBaseUrl() . '">browse</a> for one.');
 			return $this->do_error();		
 		}
 		if (!Permission::userHasDocumentReadPermission($oDocument)) {
@@ -360,7 +364,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
 		}
 		// FIXME handle ad-hoc fieldsets.
-		
+		$this->addPortlets();
         $oTemplating = new KTTemplating;
 		$oTemplate = $oTemplating->loadTemplate("kt3/compare_document");
 		$aTemplateData = array(
@@ -382,6 +386,55 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
 		// FIXME show something useful / generic.
 	}
+	function do_startComparison() {	    
+		$document_data = array();
+		$document_id = KTUtil::arrayGet($_REQUEST, 'fDocumentId');
+		if ($document_id === null) { 
+		    $this->oPage->addError('No document was requested.  Please <a href="' . KTBrowseUtil::getBrowseBaseUrl() . '">browse</a> for one.');
+			return $this->do_error();
+		}
+		$document_data["document_id"] = $document_id;
+
+		$comparison_version = KTUtil::arrayGet($_REQUEST, 'fComparisonVersion');
+		if ($comparison_version=== null) { 
+		    $this->oPage->addError('No comparison version was requested.  Please <a href="?action=history&fDocumentId='.$document_id.'">select a version</a>.');
+			return $this->do_error();
+		}		
+		
+		// try get the document.
+		$oDocument =& Document::get($document_id, $comparison_version);
+		if (PEAR::isError($oDocument)) {
+		    $this->oPage->addError('The document you attempted to retrieve is invalid.   Please <a href="' . KTBrowseUtil::getBrowseBaseUrl() . '">browse</a> for one.');
+			return $this->do_error();		
+		}
+		if (!Permission::userHasDocumentReadPermission($oDocument)) {
+		    // FIXME inconsistent.
+		    $this->oPage->addError(_('You are not allowed to view this document'));
+		    return $this->do_error();
+		}
+		$this->oDocument =& $oDocument;
+        $aOptions = array("final" => false);
+        $this->aBreadcrumbs = array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument, $aOptions));
+		$this->oPage->setBreadcrumbDetails(_("Select Document Version to compare against"));
+					
+		$aMetadataVersions = KTDocumentMetadataVersion::getByDocument($oDocument);
+        $aVersions = array();
+        foreach ($aMetadataVersions as $oVersion) {
+            $aVersions[] = Document::get($oDocument->getId(), $oVersion->getId());
+        }
+		
+		$oTemplating = new KTTemplating;
+		$oTemplate = $oTemplating->loadTemplate("ktcore/document/comparison_version_select");
+		$aTemplateData = array(
+              "context" => $this,
+			  "document_id" => $document_id,
+			  "document" => $oDocument,
+			  "versions" => $aVersions,
+              'downloadaction' => $oAction,
+		);
+		return $oTemplate->render($aTemplateData);
+    }
+	
 	function getUserForId($iUserId) {
 	    $u = User::get($iUserId);
 		return $u->getName();