Commit 33ae9d4802930adfb5984c479aaadf39f4f30820

Authored by Brad Shuttleworth
1 parent 3a9c96fc

rest of fix for KTS-453


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5932 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing 1 changed file with 10 additions and 5 deletions
search/booleanSearch.php
@@ -93,7 +93,7 @@ class BooleanSearchDispatcher extends KTStandardDispatcher { @@ -93,7 +93,7 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
93 $this->errorRedirectToMain(_kt('You need to have at least 1 condition.')); 93 $this->errorRedirectToMain(_kt('You need to have at least 1 condition.'));
94 } 94 }
95 95
96 - $res = $this->handleCriteriaSet($datavars, KTUtil::arrayGet($_REQUEST, 'fStartIndex', 1), $title); 96 + $res = $this->handleCriteriaSet($datavars, KTUtil::arrayGet($_REQUEST, 'fStartIndex', 1), $title, $oSearch->getIsCondition());
97 97
98 return $res; 98 return $res;
99 } 99 }
@@ -227,14 +227,19 @@ class BooleanSearchDispatcher extends KTStandardDispatcher { @@ -227,14 +227,19 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
227 } 227 }
228 228
229 229
230 - function handleCriteriaSet($aCriteriaSet, $iStartIndex, $sTitle=null) { 230 + function handleCriteriaSet($aCriteriaSet, $iStartIndex, $sTitle=null, $bIsCondition = false) {
231 if ($sTitle == null) { 231 if ($sTitle == null) {
232 $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _kt('Advanced Search')); 232 $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _kt('Advanced Search'));
233 $sTitle = _kt('Search Results'); 233 $sTitle = _kt('Search Results');
234 } else { 234 } else {
235 - $this->aBreadcrumbs[] = array('name' => _kt('Saved Search'));  
236 - $this->oPage->setTitle(_kt('Saved Search: ') . $sTitle);  
237 - $this->oPage->setBreadcrumbDetails($sTitle); 235 + if ($bIsCondition) {
  236 + $this->aBreadcrumbs[] = array('name' => _kt('Test Condition'));
  237 + $this->oPage->setTitle(sprintf(_kt('Test Condition: %s'), $sTitle));
  238 + } else {
  239 + $this->aBreadcrumbs[] = array('name' => _kt('Saved Search'));
  240 + $this->oPage->setTitle(sprintf(_kt('Saved Search: %s'), $sTitle));
  241 + }
  242 + $this->oPage->setBreadcrumbDetails($sTitle);
238 } 243 }
239 244
240 245