Commit 9ef3128d75a319e6b3f4dfd611837353f3bb3ee2

Authored by Jonathan Byrne
1 parent f410897a

KTS-3141

"Error in template syntax for search2 portlets"
Fixed. Fixed all hyperlink urls mentioned in the ticket.

Committed By: Jonathan Byrne
Reviewed By: Megan Watson

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@8300 c91229c3-7414-0410-bfa2-8a42b809f60b
plugins/search2/IndexingStatusDashlet.php
@@ -105,11 +105,14 @@ class IndexingStatusDashlet extends KTBaseDashlet @@ -105,11 +105,14 @@ class IndexingStatusDashlet extends KTBaseDashlet
105 $oTemplating =& KTTemplating::getSingleton(); 105 $oTemplating =& KTTemplating::getSingleton();
106 $oTemplate = $oTemplating->loadTemplate('ktcore/search2/indexing_status'); 106 $oTemplate = $oTemplating->loadTemplate('ktcore/search2/indexing_status');
107 107
  108 + $url = KTUtil::kt_url();
  109 +
108 $aTemplateData = array( 110 $aTemplateData = array(
109 'context' => $this, 111 'context' => $this,
110 'indexerName' => $this->indexerName, 112 'indexerName' => $this->indexerName,
111 'indexerDiagnosis' => $this->indexerDiagnosis, 113 'indexerDiagnosis' => $this->indexerDiagnosis,
112 - 'extractorDiagnosis' => $this->extractorDiagnosis 114 + 'extractorDiagnosis' => $this->extractorDiagnosis,
  115 + 'rootUrl' => $url
113 ); 116 );
114 117
115 return $oTemplate->render($aTemplateData); 118 return $oTemplate->render($aTemplateData);
templates/ktcore/search2/indexing_status.smarty
@@ -36,5 +36,5 @@ @@ -36,5 +36,5 @@
36 <B>{i18n}Note:{/i18n}</b> {i18n}Indexing will not continue until all issues have been resolved.{/i18n} 36 <B>{i18n}Note:{/i18n}</b> {i18n}Indexing will not continue until all issues have been resolved.{/i18n}
37 <table width="100%"> 37 <table width="100%">
38 <tr> 38 <tr>
39 -<td align=right><a href="/search2.php?action=refreshDashboardStatus">Refresh</a> 39 +<td align=right><a href="{$rootUrl}/search2.php?action=refreshDashboardStatus">Refresh</a>
40 </table> 40 </table>
templates/ktcore/search2/lucene_statistics.smarty
@@ -79,7 +79,7 @@ toggle.style.display = &#39;none&#39;; @@ -79,7 +79,7 @@ toggle.style.display = &#39;none&#39;;
79 {/if} 79 {/if}
80 </table> 80 </table>
81 <table width="100%"> 81 <table width="100%">
82 -<tr><td colspan=2 align=right><a href="/search2.php?action=refreshLuceneStats" align=right>{i18n}Refresh{/i18n}</a></tr> 82 +<tr><td colspan=2 align=right><a href="{$rootUrl}/search2.php?action=refreshLuceneStats" align=right>{i18n}Refresh{/i18n}</a></tr>
83 </table> 83 </table>
84 84
85 85