Changeset 2372 for sandbox/workflow/trunk/inc/class.so_move_instances.inc.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/class.so_move_instances.inc.php (modified) (4 diffs)

sandbox/workflow/trunk/inc/class.so_move_instances.inc.php

@@ -11 +11 @@
 \**************************************************************************/
 
-require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ProcessManager.php');
-require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php');
 
 /**
@@ -91 +89 @@
                 $this->userID = $_SESSION['phpgw_info']['workflow']['account_id'];
                 $this->isAdmin = $_SESSION['phpgw_info']['workflow']['user_is_admin'];
-                $this->acl = &$GLOBALS['ajax']->acl;
-                $this->db = &$GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;
+                $this->acl =& $GLOBALS['ajax']->acl;
+                $this->db =& Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID;
         }
 
@@ -113 +111 @@
                                 $where[] = 'wf_p_id IS NULL';
                 }
-                $processManager = new ProcessManager($this->db);
+                $processManager = &Factory::getInstance('ProcessManager', $this->db);
 
                 /* workaround to sort the result using two columns */
@@ -137 +135 @@
                 $this->_checkAccess($processID);
 
-                $activityManager = new ActivityManager($this->db);
+                $activityManager = &Factory::newInstance('ActivityManager');
                 $activities = $activityManager->list_activities($processID, 0, -1, 'wf_name__ASC', '', 'wf_type <> \'standalone\' AND wf_type <> \'view\'');
                 $output = array();