Peter M. Groen / knowledgetree

Commit 02429e63d1addc775ad06c81dd30c8a8abd07b73

Authored by kevin_fourie
1 parent 58f8c222

Merged in from STABLE trunk... 

KTS-3488
"Pending Documents Indexing Queue does not use rootUrl (with patch)"
Fixed. 

Committed by: Kevin Fourie
Reviwed by: Conrad Vermeulen


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3-Release-Branch@8833 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 8 additions and 5 deletions
plugins/search2/reporting/PendingDocuments.php
  View file @02429e6
@@ -68,14 +68,17 @@ class PendingDocumentsDispatcher extends KTAdminDispatcher @@ -68,14 +68,17 @@ class PendingDocumentsDispatcher extends KTAdminDispatcher
68 $aPendingDocs[$key] = $doc; 68 $aPendingDocs[$key] = $doc;
69 } 69 }
70 70
71 - $oTemplating =& KTTemplating::getSingleton(); 71 + $oTemplating =& KTTempating::getSingleton();
72 $oTemplating->addLocation('Pending Documents', '/plugins/search2/reporting/templates'); 72 $oTemplating->addLocation('Pending Documents', '/plugins/search2/reporting/templates');
73 $oTemplate =& $oTemplating->loadTemplate('pendingdocuments'); 73 $oTemplate =& $oTemplating->loadTemplate('pendingdocuments');
74 74
  75 + $config = KTConfig::getSingleton();
  76 + $rootUrl = $config->get('KnowledgeTree/rootUrl');
  77 +
75 $oTemplate->setData(array( 78 $oTemplate->setData(array(
76 'context' => $this, 79 'context' => $this,
77 - 'pending_docs' => $aPendingDocs  
78 - 80 + 'pending_docs' => $aPendingDocs,
  81 + 'root_url' => $rootUrl
79 )); 82 ));
80 return $oTemplate; 83 return $oTemplate;
81 } 84 }
plugins/search2/reporting/templates/pendingdocuments.smarty
  View file @02429e6
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 25
26 {foreach key=key from=$pending_docs item=pendingDocs} 26 {foreach key=key from=$pending_docs item=pendingDocs}
27 <tr> 27 <tr>
28 - <td><a href="/view.php?fDocumentId={$pendingDocs.document_id}">{$pendingDocs.filename|truncate:40:'...'}</a></td> 28 + <td><a href="{$root_url}/view.php?fDocumentId={$pendingDocs.document_id}">{$pendingDocs.filename|truncate:40:'...'}</a></td>
29 <td>{if $pendingDocs.extractor}{$pendingDocs.extractor}{else}<p><font color="#FF9933">{i18n}n/a{/i18n}</font></p>{/if}</td> 29 <td>{if $pendingDocs.extractor}{$pendingDocs.extractor}{else}<p><font color="#FF9933">{i18n}n/a{/i18n}</font></p>{/if}</td>
30 <td>{$pendingDocs.indexdate}</td> 30 <td>{$pendingDocs.indexdate}</td>
31 </tr> 31 </tr>
@@ -35,4 +35,4 @@ @@ -35,4 +35,4 @@
35 35
36 </table> 36 </table>
37 37
38 -{/if}  
39 \ No newline at end of file 38 \ No newline at end of file
  39 +{/if}