Changeset 2372 for sandbox/workflow/trunk/inc/local/classes/class.wf_instance.php

Timestamp:

03/29/10 14:46:01 (14 years ago)

Author:

pedroerp

Message:

Ticket #609 - Merged 2197:2356 /sandbox/workflow/branches/609/ em /sandbox/workflow/trunk.

File:

• sandbox/workflow/trunk/inc/local/classes/class.wf_instance.php (modified) (5 diffs)

sandbox/workflow/trunk/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;
@@ -118 +118 @@
                 $instance = $this->getInstanceObject($instanceID);
 
-                $runActivity = CreateObject('workflow.run_activity');
+                $runActivity = Factory::getInstance('run_activity');
 
                 ob_start();
@@ -423 +423 @@
 
                 /* 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 +455 @@
                 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 +525 @@
 
                 /* 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;