Little mod to discussion, clean up others.

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5486 c91229c3-7414-0410-bfa2-8a42b809f60b

Little mod to discussion, clean up others.
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5486 c91229c3-7414-0410-bfa2-8a42b809f60b
bryndivey
1 parent 79d4ba97
Showing 3 changed files with 39 additions and 38 deletions
lib/browse/PartialQuery.inc.php
plugins/ktstandard/KTDiscussion.php
search/simpleSearch.php
@@ -370,6 +370,7 @@ class SimpleSearchQuery extends PartialQuery {
         $aParams[] = $iBatchSize;
         $q = array($sQuery, $aParams);
+
         $res = DBUtil::getResultArray($q); 
         return $res;
@@ -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));
@@ -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);
 	}   
 }