Commit 7a8d3786b23e0a37a9e2b9911e3cc37d4c76ff01
1 parent
a4b1b97d
changed getChosenMetaDataTags to use passed array and modified callers appropriately
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2689 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
3 changed files
with
4 additions
and
5 deletions
presentation/lookAndFeel/knowledgeTree/administration/documentmanagement/manageArchivedDocumentsBL.php
| @@ -48,7 +48,7 @@ if (checkSession()) { | @@ -48,7 +48,7 @@ if (checkSession()) { | ||
| 48 | 48 | ||
| 49 | if (strlen($fSearchString) > 0) { | 49 | if (strlen($fSearchString) > 0) { |
| 50 | // perform the search and display the results | 50 | // perform the search and display the results |
| 51 | - $sMetaTagIDs = getChosenMetaDataTags(); | 51 | + $sMetaTagIDs = getChosenMetaDataTags($_GET); |
| 52 | if (strlen($sMetaTagIDs) > 0) { | 52 | if (strlen($sMetaTagIDs) > 0) { |
| 53 | $sSQLSearchString = getSQLSearchString($fSearchString); | 53 | $sSQLSearchString = getSQLSearchString($fSearchString); |
| 54 | $aDocuments = searchForDocuments($sMetaTagIDs, $sSQLSearchString, "Archived"); | 54 | $aDocuments = searchForDocuments($sMetaTagIDs, $sSQLSearchString, "Archived"); |
| @@ -140,7 +140,6 @@ if (checkSession()) { | @@ -140,7 +140,6 @@ if (checkSession()) { | ||
| 140 | $main->setCentralPayload($oContent); | 140 | $main->setCentralPayload($oContent); |
| 141 | $main->setFormAction($_SERVER['PHP_SELF']); | 141 | $main->setFormAction($_SERVER['PHP_SELF']); |
| 142 | $main->setHasRequiredFields(true); | 142 | $main->setHasRequiredFields(true); |
| 143 | - $main->setSubmitMethod("GET"); | ||
| 144 | $main->render(); | 143 | $main->render(); |
| 145 | } | 144 | } |
| 146 | 145 |
presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
| @@ -46,7 +46,7 @@ if (checkSession()) { | @@ -46,7 +46,7 @@ if (checkSession()) { | ||
| 46 | $oPatternCustom = & new PatternCustom(); | 46 | $oPatternCustom = & new PatternCustom(); |
| 47 | 47 | ||
| 48 | //display search results | 48 | //display search results |
| 49 | - $sMetaTagIDs = getChosenMetaDataTags(); | 49 | + $sMetaTagIDs = getChosenMetaDataTags($_POST); |
| 50 | 50 | ||
| 51 | if (strlen($sMetaTagIDs) > 0) { | 51 | if (strlen($sMetaTagIDs) > 0) { |
| 52 | $sSQLSearchString = getSQLSearchString($fSearchString); | 52 | $sSQLSearchString = getSQLSearchString($fSearchString); |
presentation/lookAndFeel/knowledgeTree/search/advancedSearchUtil.inc
| @@ -29,8 +29,8 @@ | @@ -29,8 +29,8 @@ | ||
| 29 | /** | 29 | /** |
| 30 | * Interrogates the posted variables for the chosen metadata tags | 30 | * Interrogates the posted variables for the chosen metadata tags |
| 31 | */ | 31 | */ |
| 32 | -function getChosenMetaDataTags() { | ||
| 33 | - $aKeys = array_keys($_POST); | 32 | +function getChosenMetaDataTags($aVariables) { |
| 33 | + $aKeys = array_keys($aVariables); | ||
| 34 | $aTagIDs = array(); | 34 | $aTagIDs = array(); |
| 35 | for ($i = 0; $i < count($aKeys); $i++) { | 35 | for ($i = 0; $i < count($aKeys); $i++) { |
| 36 | $sRowStart = $aKeys[$i]; | 36 | $sRowStart = $aKeys[$i]; |