Changeset 3167 for branches/2.2/workflow/inc/class.so_move_instances.inc.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/class.so_move_instances.inc.php (modified) (5 diffs)

branches/2.2/workflow/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');
 
                 /* 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();
@@ -320 +318 @@
                 }
 
-                /* format the array elements for use in a SELECT SQL statement, e.g. [iid => 12, aid = 27] would produce (12, 27) */
-                $instanceActivityList = array_map(create_function('$e', 'return \'(\' . $e[\'iid\'] . \', \' . $e[\'aid\'] . \')\';'), $instanceActivityList);
-
-                /* update the interinstance relations of the modified rows of the instance_activities table */
-                $resultSet = $this->db->query("SELECT wf_parent_instance_id, wf_parent_activity_id FROM egw_wf_interinstance_relations WHERE ((wf_parent_instance_id, wf_parent_activity_id) IN (" . implode(', ', $instanceActivityList) . "))");
-                $rows = $resultSet->GetArray(-1);
-                if (is_array($rows))
-                {
-                        foreach ($rows as $row)
-                        {
-                                /* update the activity ID */
-                                if (!$this->db->query("UPDATE egw_wf_interinstance_relations SET wf_parent_activity_id = ? WHERE (wf_parent_instance_id = ?) AND (wf_parent_activity_id = ?)", array($activitiesConvert[$row['wf_parent_activity_id']], $row['wf_parent_instance_id'], $row['wf_parent_activity_id'])))
-                                {
-                                        $this->db->FailTrans();
-                                        return array('error' => 'Erro atualizando a tabela de relacionamento inter-instância. Nenhuma modificação foi salva');
-                                }
-                        }
-                }
-
                 /* in case of success, commit the modifications */
                 $this->db->CompleteTrans();