Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • sandbox/workflow/trunk/inc/class.workflow_processmanager.inc.php

    r795 r2372  
    55 
    66        require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ProcessManager.php'); 
    7         require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'RoleManager.php'); 
    8         require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php'); 
    9         require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'API' . SEP . 'Process.php'); 
     7 
    108        /** 
    119         * @package Workflow 
     
    2624                        'database_user', 
    2725                        'database_password' 
    28                 );  
     26                ); 
    2927           /** 
    3028                 * Constructor 
     
    3432                function workflow_processmanager() 
    3533                { 
    36                         parent::ProcessManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID); 
    37                         $this->workflow_acl = CreateObject('workflow.workflow_acl'); 
    38                          
     34                        parent::ProcessManager(); 
     35                        $this->workflow_acl = Factory::getInstance('workflow_acl'); 
     36 
    3937                        /* allow regular users to see the process graph */ 
    4038                        if ($_GET['menuaction'] == "workflow.ui_adminactivities.show_graph") 
     
    6260                function import_process(&$data) 
    6361                { 
    64                         if (!(isset($this->activity_manager)))  $this->activity_manager = new ActivityManager($this->db); 
     62                        if (!(isset($this->activity_manager)))  $this->activity_manager = &Factory::newInstance('ActivityManager'); 
    6563 
    6664                        if (parent::import_process($data)) 
     
    121119                function serialize_process($pId) 
    122120                { 
    123                         if (!(isset($this->activity_manager)))  $this->activity_manager = new ActivityManager($this->db); 
     121                        if (!(isset($this->activity_manager)))  $this->activity_manager = &Factory::newInstance('ActivityManager'); 
    124122                        if (!isset($this->jobManager)) 
    125                                 $this->jobManager = new JobManager($this->db); 
     123                                $this->jobManager = &Factory::newInstance('JobManager'); 
    126124                 
    127125                        //if (!(isset($this->activity_manager)))  $this->activity_manager = new ActivityManager($this->db); 
Note: See TracChangeset for help on using the changeset viewer.