diff --git a/lib/browse/PartialQuery.inc.php b/lib/browse/PartialQuery.inc.php index 3575ca8..a79f7cc 100644 --- a/lib/browse/PartialQuery.inc.php +++ b/lib/browse/PartialQuery.inc.php @@ -370,6 +370,7 @@ class SimpleSearchQuery extends PartialQuery { $aParams[] = $iBatchSize; $q = array($sQuery, $aParams); + $res = DBUtil::getResultArray($q); return $res; diff --git a/plugins/ktstandard/KTDiscussion.php b/plugins/ktstandard/KTDiscussion.php index ef1c03a..6b5d3b7 100644 --- a/plugins/ktstandard/KTDiscussion.php +++ b/plugins/ktstandard/KTDiscussion.php @@ -228,10 +228,9 @@ class KTDocumentDiscussionAction extends KTDocumentAction { $replyFields[] = new KTStringWidget(_kt("Subject"), _kt("The topic of discussion in this thread"), "subject", "", $this->oPage, true); $replyFields[] = new KTTextWidget(_kt("Body"), _kt("Your contribution to the discussion in this thread"), "body", "", $this->oPage, true, null, null, array("cols" => 50, "rows" => 10)); - // Fields for closing thread (if user has write permission) + // Fields for closing thread (if user has workflow permission) $closeFields = array(); - - $oPermission =& KTPermission::getByName('ktcore.permissions.write'); + $oPermission =& KTPermission::getByName('ktcore.permissions.workflow'); if (!PEAR::isError($oPermission) && KTPermissionUtil::userHasPermissionOnItem($this->oUser, $oPermission, $this->oDocument) && $oThread->getState() != DISCUSSION_CLOSED) { $aOptions = array('vocab' => $this->_buildStates($oThread)); diff --git a/search/simpleSearch.php b/search/simpleSearch.php index 6021b13..b3f6e5c 100644 --- a/search/simpleSearch.php +++ b/search/simpleSearch.php @@ -137,56 +137,57 @@ class SimpleSearchDispatcher extends KTStandardDispatcher { $aErrorOptions = array( "message" => _kt("Please provide a search term"), ); - $searchable_text = KTUtil::arrayGet($_REQUEST, "fSearchableText"); + $searchable_text = KTUtil::arrayGet($_REQUEST, "fSearchableText"); $this->oValidator->notEmpty($searchable_text, $aErrorOptions); - $collection = new DocumentCollection; - $this->browseType = "Folder"; + $collection = new DocumentCollection; + $this->browseType = "Folder"; - //$collection->addColumn(new SelectionColumn("Browse Selection","selection")); + //$collection->addColumn(new SelectionColumn("Browse Selection","selection")); /* $t = new SimpleSearchTitleColumn("Test 1 (title)","title"); $t->setOptions(array('documenturl' => $GLOBALS['KTRootUrl'] . '/view.php')); $t->setSearch($searchable_text); - */ - $t =& new TitleColumn("Test 1 (title)","title"); - $t->setOptions(array('documenturl' => $GLOBALS['KTRootUrl'] . '/view.php', 'direct_folder' => true)); - $collection->addColumn($t); - $collection->addColumn(new DownloadColumn('','download')); - $collection->addColumn(new DateColumn(_kt("Created"),"created", "getCreatedDateTime")); - $collection->addColumn(new DateColumn(_kt("Last Modified"),"modified", "getLastModifiedDate")); + */ + + $t =& new TitleColumn("Test 1 (title)","title"); + $t->setOptions(array('documenturl' => $GLOBALS['KTRootUrl'] . '/view.php', 'direct_folder' => true)); + $collection->addColumn($t); + $collection->addColumn(new DownloadColumn('','download')); + $collection->addColumn(new DateColumn(_kt("Created"),"created", "getCreatedDateTime")); + $collection->addColumn(new DateColumn(_kt("Last Modified"),"modified", "getLastModifiedDate")); $collection->addColumn(new UserColumn(_kt('Creator'),'creator_id','getCreatorID')); - $collection->addColumn(new WorkflowColumn(_kt('Workflow State'),'workflow_state')); - - $batchPage = (int) KTUtil::arrayGet($_REQUEST, "page", 0); - $batchSize = 20; + $collection->addColumn(new WorkflowColumn(_kt('Workflow State'),'workflow_state')); - $resultURL = KTUtil::addQueryStringSelf("fSearchableText=" . $searchable_text); - $collection->setBatching($resultURL, $batchPage, $batchSize); + $batchPage = (int) KTUtil::arrayGet($_REQUEST, "page", 0); + $batchSize = 20; + $resultURL = KTUtil::addQueryStringSelf("fSearchableText=" . $searchable_text); + $collection->setBatching($resultURL, $batchPage, $batchSize); - // ordering. (direction and column) - $displayOrder = KTUtil::arrayGet($_REQUEST, 'sort_order', "asc"); - if ($displayOrder !== "asc") { $displayOrder = "desc"; } - $displayControl = KTUtil::arrayGet($_REQUEST, 'sort_on', "title"); - $collection->setSorting($displayControl, $displayOrder); + // ordering. (direction and column) + $displayOrder = KTUtil::arrayGet($_REQUEST, 'sort_order', "asc"); + if ($displayOrder !== "asc") { $displayOrder = "desc"; } + $displayControl = KTUtil::arrayGet($_REQUEST, 'sort_on', "title"); - // add in the query object. - $qObj = new SimpleSearchQuery($searchable_text); - $collection->setQueryObject($qObj); + $collection->setSorting($displayControl, $displayOrder); - // breadcrumbs - // FIXME handle breadcrumbs - $collection->getResults(); + // add in the query object. + $qObj = new SimpleSearchQuery($searchable_text); + $collection->setQueryObject($qObj); - $oTemplating =& KTTemplating::getSingleton(); - $oTemplate = $oTemplating->loadTemplate("kt3/browse"); - $aTemplateData = array( - "context" => $this, - "collection" => $collection, - ); - return $oTemplate->render($aTemplateData); + // breadcrumbs + // FIXME handle breadcrumbs + $collection->getResults(); + + $oTemplating =& KTTemplating::getSingleton(); + $oTemplate = $oTemplating->loadTemplate("kt3/browse"); + $aTemplateData = array( + "context" => $this, + "collection" => $collection, + ); + return $oTemplate->render($aTemplateData); } }