Changeset 3167 for branches/2.2/workflow/inc/local/classes/class.wf_instance.php

Timestamp:

08/17/10 16:17:12 (14 years ago)

Author:

viani

Message:

Ticket #1135 - Merged r1990:3166 from /trunk/workflow into /branches/2.2/workflow

File:

• branches/2.2/workflow/inc/local/classes/class.wf_instance.php (modified) (7 diffs)

branches/2.2/workflow/inc/local/classes/class.wf_instance.php

@@ -77 +77 @@
         {
                 $instanceID = (int) $instanceID;
-                $instance = CreateObject('workflow.workflow_instance');
+                $instance = Factory::getInstance('workflow_instance');
                 if (!$instance->getInstance($instanceID))
                         return false;
@@ -92 +92 @@
         {
                 /* load the DB */
-                $this->db = &$GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;
+                $this->db = &Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID;
 
                 /* load the process ID from the runtime */
@@ -118 +118 @@
                 $instance = $this->getInstanceObject($instanceID);
 
-                $runActivity = CreateObject('workflow.run_activity');
+                $runActivity = Factory::getInstance('run_activity');
 
                 ob_start();
@@ -250 +250 @@
 
         /**
-        * Busca as instâncias filhas de uma instância
-        * Se os parâmetros não forem informados, retorna instâncias filhas das instância atual.
-        * @param int $instanceID O ID da instância pai (não obrigatório).
-        * @param int $activityID O ID da atividade corrente da instância pai
-        * @return array As instâncias filhas do par instância/atividade atual
-        * @access public
-        */
-        public function getChildren($instanceID = null, $activityID = null)
+        * This method gets all children instances of the given instance.
+        * If there is no parameter, it gets the children instances of the current instance
+        * @param int $instanceID Dad instance's identification.
+        * @return array Array with the children instances, or false
+        * @access public
+        */
+        public function getChildren($instanceID = null)
         {
                 $output = array();
                 if (is_null($instanceID))
                         $instanceID = $GLOBALS['workflow']['wf_runtime']->instance_id;
-                if (is_null($activityID))
-                        $activityID = $GLOBALS['workflow']['wf_runtime']->activity_id;
-
-                /* check instanceID */
-                if (!$this->checkInstanceAccess($instanceID, $activityID))
+
+                /* check instanceID */
+                if (!$this->checkInstanceAccess($instanceID))
                         return $output;
 
                 /* build the SQL query */
-                $query = 'SELECT i.wf_instance_id AS wf_instance_id, ia.wf_activity_id AS wf_activity_id, ia.wf_started AS wf_started, i.wf_name AS wf_name, i.wf_status AS wf_status, ia.wf_user AS wf_user, ir.wf_parent_lock AS wf_parent_lock ';
-                $query .= 'FROM egw_wf_interinstance_relations ir, egw_wf_instances i LEFT JOIN egw_wf_instance_activities ia ON (ia.wf_instance_id = i.wf_instance_id)';
-                $query .= 'WHERE (ir.wf_child_instance_id = i.wf_instance_id) AND (ir.wf_parent_instance_id = ?) AND (ir.wf_parent_activity_id = ?)';
-
-                $result = $this->db->query($query, array($instanceID, $activityID));
+                $query = "
+                        SELECT
+                                i.wf_instance_id AS wf_instance_id,
+                                ia.wf_activity_id AS wf_activity_id,
+                                i.wf_started AS wf_started,
+                                i.wf_name AS wf_name,
+                                i.wf_status AS wf_status,
+                                ia.wf_user AS wf_user,
+                                ir.wf_parent_lock AS wf_parent_lock
+                        FROM
+                            egw_wf_interinstance_relations as ir
+                        LEFT JOIN
+                            egw_wf_instances as i
+                        ON
+                            i.wf_instance_id = ir.wf_child_instance_id
+                        LEFT JOIN
+                            egw_wf_instance_activities as ia
+                        ON
+                            i.wf_instance_id = ia.wf_instance_id
+                        WHERE
+                            ir.wf_parent_instance_id = ?";
+
+                $result = $this->db->query($query, array($instanceID));
                 $output = $result->GetArray(-1);
 
@@ -423 +438 @@
 
                 /* load the required instance (for the required user) */
-                require_once GALAXIA_LIBRARY . SEP . 'src' . SEP . 'GUI' . SEP . 'GUI.php';
-                $GUI = new GUI($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);
+                $GUI = &Factory::newInstance('GUI');
                 $userInstance = $GUI->gui_list_user_instances($userID, 0, -1, '', '', "(ga.wf_is_interactive = 'y') AND (gia.wf_activity_id = {$activityID}) AND (gia.wf_instance_id = {$instanceID})", false, $this->processID, true, false, true, false, false, false);
                 $userInstance = $userInstance['data'];
@@ -456 +470 @@
                 if ($userID !== '*')
                 {
-                        require_once dirname(__FILE__) . '/class.wf_role.php';
-                        require_once dirname(__FILE__) . '/class.wf_engine.php';
-
-                        $wfRole = new wf_role();
-                        $engine = new wf_engine();
+                        $wfRole = Factory::getInstance('wf_role');
+                        $engine = Factory::getInstance('wf_engine');
                         /* get information about the activity */
                         if (($activityInfo = $engine->getActivityInformationByID($activityID)) === false)
@@ -529 +540 @@
 
                 /* try to get the role id */
-                require_once dirname(__FILE__) . '/class.wf_role.php';
-                $wfRole = new wf_role();
+                $wfRole = Factory::getInstance('wf_role');
                 if (($roleID = $wfRole->getRoleIdByName($roleName)) === false)
                         return false;