Merged in from DEV trunk...

KTS-2507 " Workflow Transitions reset after adding new transition to existing workflow." Fixed When adding a new transition the old data should remain intact. Committed By: Jonathan Byrne Reviewed By: Kevin Fourie KTS-2524 "Create document indexer shutdown script" Implemented. Also did a few other small fixes... Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie KTS-2524 "Create document indexer shutdown script" Implemented. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie KTS-2520 "Fatal Error when deleting a state in a workflow and selecting a replacement state." Fixed typo. KTWorkflowTransitions should have been KTWorkflowTransition. Committed By: Kevin Fourie Reviewed By: Jonathan Byrne git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@7430 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from DEV trunk...
KTS-2507 " Workflow Transitions reset after adding new transition to existing workflow." Fixed When adding a new transition the old data should remain intact. Committed By: Jonathan Byrne Reviewed By: Kevin Fourie KTS-2524 "Create document indexer shutdown script" Implemented. Also did a few other small fixes... Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie KTS-2524 "Create document indexer shutdown script" Implemented. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie KTS-2520 "Fatal Error when deleting a state in a workflow and selecting a replacement state." Fixed typo. KTWorkflowTransitions should have been KTWorkflowTransition. Committed By: Kevin Fourie Reviewed By: Jonathan Byrne git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@7430 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent c0e0a141
Showing 4 changed files with 44 additions and 14 deletions
lib/workflow/workflowutil.inc.php
plugins/ktcore/admin/workflowsv2.php
search2/indexing/indexerCore.inc.php
search2/indexing/indexers/JavaXMLRPCLuceneIndexer.inc.php
@@ -831,7 +831,7 @@ class KTWorkflowUtil {
         if (PEAR::isError($res)) { return $res; }
         Document::clearAllCaches();
-        KTWorkflowTransitions::clearAllCaches();
+        KTWorkflowTransition::clearAllCaches();
     }
 }
@@ -625,7 +625,7 @@ class KTWorkflowAdminV2 extends KTAdminDispatcher {
         $to = (array) KTUtil::arrayGet($_REQUEST, 'fTo');
         $from = (array) KTUtil::arrayGet($_REQUEST, 'fFrom');
-        
+
         // we do not trust any of this data.
         $states = KTWorkflowState::getByWorkflow($this->oWorkflow);
         $states = KTUtil::keyArray($states);
@@ -656,8 +656,16 @@ class KTWorkflowAdminV2 extends KTAdminDispatcher {
                     $source_state_ids[] = $oState->getId();
                 }                
             }
-
-            $res = KTWorkflowAdminUtil::saveTransitionSources($oTransition, $source_state_ids);
+			
+			$aFromTransitionID = array_keys($_REQUEST['fFrom']);
+			//run through all transitions to change
+			foreach ($aFromTransitionID as $iCurrentId)
+			{
+            	if($oTransition->getId() == $iCurrentId)
+            	{
+            		$res = KTWorkflowAdminUtil::saveTransitionSources($oTransition, $source_state_ids);
+            	}
+			}
             if (PEAR::isError($res)) {
                 $this->errorRedirectTo('basic', sprintf(_kt("Failed to set transition origins: %s"), $res->getMessage()));                              
             }
@@ -32,13 +32,13 @@ class QueryResultItem
 	protected $status;
 	protected $folderId;
-
 	public function __construct($document_id, $rank=null, $title=null, $text=null)
 	{
-		$this->document_id=$document_id;
+		$this->document_id=(int) $document_id;
 		$this->rank= $rank;
 		$this->title=$title;
 		$this->text = $text;
+		$this->live = true;
 		$this->loadDocumentInfo();
 	}
@@ -57,14 +57,13 @@ class QueryResultItem
 		return true; // should not be reached
 	}
-	private function loadDocumentInfo()
+	public function loadDocumentInfo()
 	{
 		$sql = "SELECT
-					f.folder_id, f.full_path, f.name, dcv.size as filesize, dcv.major_version,
+					d.folder_id, f.full_path, f.name, dcv.size as filesize, dcv.major_version,
 					dcv.minor_version, dcv.filename, cou.name as checkoutuser, w.human_name as workflow, ws.human_name as workflowstate,
 					mt.mimetypes as mimetype, md.mime_doc as mimedoc, d.checkedout, mbu.name as modifiedbyuser, d.modified,
 					cbu.name as createdbyuser, ou.name as owneruser, d.immutable, d.status_id, d.created
-
 				FROM
 					documents d
 					INNER JOIN document_metadata_version dmv ON d.metadata_version_id = dmv.id
@@ -78,7 +77,6 @@ class QueryResultItem
 					LEFT JOIN users mbu ON d.modified_user_id=mbu.id
 					LEFT JOIN users cbu ON d.creator_id=cbu.id
 					LEFT JOIN users ou ON d.owner_id=ou.id
-
 				WHERE
 					d.id=$this->document_id";
@@ -87,10 +85,9 @@ class QueryResultItem
 		if (PEAR::isError($result) || empty($result))
 		{
 			$this->live = false;
-			return;
+			throw new Exception('QueryResultItem::loadDocumentInfo failed');
 		}
-		$this->live = true;
 		if (is_null($result['name']))
 		{
 			$this->fullpath = '(orphaned)';
@@ -137,7 +134,7 @@ class QueryResultItem
 			case 'Title': return (string) $this->title;
 			case 'FullPath': return (string)  $this->fullpath;
 			case 'IsLive': return (bool) $this->live;
-			case 'Filesize': return (int) $this->filesize;
+			case 'Filesize': return $this->filesize;
 			case 'Version': return (string) $this->version;
 			case 'Filename': return (int)$this->filename;
 			case 'FolderId': return (int)$this->folderId;
@@ -180,7 +177,13 @@ class QueryResultItem
 			case 'Status':
 				return $this->status;
 			case 'CanBeReadByUser':
-				return (bool) $this->live && (Permission::userHasDocumentReadPermission($this->Document) || Permission::adminIsInAdminMode());
+				if (!$this->live)
+					return false;
+				if (Permission::userHasDocumentReadPermission($this->Document))
+					return true;
+				if (Permission::adminIsInAdminMode())
+					return true;
+				return false;
 			default:
 				throw new Exception("Unknown property '$property' to get on MatchResult");
 		}
@@ -1170,6 +1173,15 @@ abstract class Indexer
     }
     /**
+     * Shuts down the indexer
+     *
+     */
+    public function shutdown()
+    {
+    	// do nothing generally
+    }
+
+    /**
      * Returns the name of the indexer.
      *
      * @return string
@@ -115,6 +115,16 @@ class JavaXMLRPCLuceneIndexer extends Indexer
     }
     /**
+     * Shut down the java server
+     *
+     */
+    public function shutdown()
+    {
+    	$this->lucene->shutdown();
+    }
+
+
+    /**
      * Enter description here...
      *
      * @param string $query