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

branches/2.2/workflow/inc/class.workflow_processmanager.inc.php

@@ -5 +5 @@
 
         require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ProcessManager.php');
-        require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'RoleManager.php');
-        require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php');
-        require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'API' . SEP . 'Process.php');
+
         /**
          * @package Workflow
@@ -26 +24 @@
                         'database_user',
                         'database_password'
-                ); 
+                );
            /**
                  * Constructor
@@ -34 +32 @@
                 function workflow_processmanager()
                 {
-                        parent::ProcessManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);
-                        $this->workflow_acl = CreateObject('workflow.workflow_acl');
-                        
+                        parent::ProcessManager();
+                        $this->workflow_acl = Factory::getInstance('workflow_acl');
+
                         /* allow regular users to see the process graph */
                         if ($_GET['menuaction'] == "workflow.ui_adminactivities.show_graph")
@@ -62 +60 @@
                 function import_process(&$data)
                 {
-                        if (!(isset($this->activity_manager)))  $this->activity_manager = new ActivityManager($this->db);
+                        if (!(isset($this->activity_manager)))  $this->activity_manager = &Factory::newInstance('ActivityManager');
 
                         if (parent::import_process($data))
@@ -121 +119 @@
                 function serialize_process($pId)
                 {
-                        if (!(isset($this->activity_manager)))  $this->activity_manager = new ActivityManager($this->db);
+                        if (!(isset($this->activity_manager)))  $this->activity_manager = &Factory::newInstance('ActivityManager');
                         if (!isset($this->jobManager))
-                                $this->jobManager = new JobManager($this->db);
+                                $this->jobManager = &Factory::newInstance('JobManager');
                 
                         //if (!(isset($this->activity_manager)))  $this->activity_manager = new ActivityManager($this->db);
@@ -228 +226 @@
                           fclose($fp);
                           $out.='      ]]></code>';
-                          if($res['wf_is_interactive']=='y') {
-                                $out.='      <template><![CDATA[';
-                                $fp=fopen(GALAXIA_PROCESSES.SEP."$wf_procname".SEP."code".SEP."templates".SEP."$name.tpl","r");
-                                //while(!feof($fp)) {
-                                //      $line=fread($fp,8192);
-                                        $out.=''; //all templatess will be exported in another section
-                                //}
-                                fclose($fp);
-                                $out.='      ]]></template>';
-                          }
                           $out.='    </activity>'."\n";    
                         }