Changeset 17904

Show
Ignore:
Timestamp:
10/03/08 17:59:32 (2 months ago)
Author:
flack
Message:

removed another legacy wrapper class

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/midcom/org.openpsa.helpers/tasks.php

    r14335 r17904  
    2929        } 
    3030 
    31         $qb = $_MIDCOM->dbfactory->new_query_builder('org_openpsa_projects_task'); 
     31        $qb = org_openpsa_projects_task::new_query_builder(); 
    3232        /* 
    3333         * Display those that are active or finished less than two weeks ago 
    …… 
    5555 
    5656        //Execute 
    57         $ret = $_MIDCOM->dbfactory->exec_query_builder($qb); 
     57        $ret = $qb->execute(); 
    5858        if (   is_array($ret) 
    5959            && count($ret)>0) 

  • trunk/midcom/org.openpsa.projects/config/midcom_dba_classes.inc

    r4794 r17904  
    33    'old_class_name' => null, 
    44    'new_class_name' => 'org_openpsa_task', 
    5     'midcom_class_name' => 'midcom_org_openpsa_task' 
     5    'midcom_class_name' => 'org_openpsa_projects_task' 
    66), 
    77array( 

  • trunk/midcom/org.openpsa.projects/handler/project/admin.php

    r17595 r17904  
    2020     * The project to operate on 
    2121     * 
    22      * @var org_openpsa_projects_task_dba 
     22     * @var org_openpsa_projects_task 
    2323     * @access private 
    2424     */ 

  • trunk/midcom/org.openpsa.projects/handler/task/admin.php

    r17567 r17904  
    2020     * The task to operate on 
    2121     * 
    22      * @var org_openpsa_projects_task_dba 
     22     * @var org_openpsa_projects_task 
    2323     * @access private 
    2424     */ 

  • trunk/midcom/org.openpsa.projects/handler/task/list.php

    r17668 r17904  
    178178 
    179179        // Tasks user is manager of that are pending acceptance 
    180         $qb = $_MIDCOM->dbfactory->new_query_builder('org_openpsa_projects_task'); 
     180        $qb = org_openpsa_projects_task::new_query_builder(); 
    181181        $qb->add_constraint('status', '=', ORG_OPENPSA_TASKSTATUS_PROPOSED); 
    182182        $qb->add_constraint('orgOpenpsaObtype', '=', ORG_OPENPSA_OBTYPE_TASK); 
    …… 
    187187            $qb->add_constraint('orgOpenpsaOwnerWg', '=', $GLOBALS['org_openpsa_core_workgroup_filter']); 
    188188        } 
    189         $ret = $_MIDCOM->dbfactory->exec_query_builder($qb); 
     189        $ret = $qb->execute(); 
    190190        if (   is_array($ret) 
    191191            && count($ret) > 0) 
    …… 
    202202 
    203203        // Tasks user is manager of that are have been declined by all resources 
    204         $qb = $_MIDCOM->dbfactory->new_query_builder('org_openpsa_projects_task'); 
     204        $qb = org_openpsa_projects_task::new_query_builder(); 
    205205        $qb->add_constraint('status', '=', ORG_OPENPSA_TASKSTATUS_DECLINED); 
    206206        $qb->add_constraint('orgOpenpsaObtype', '=', ORG_OPENPSA_OBTYPE_TASK); 
    …… 
    211211            $qb->add_constraint('orgOpenpsaOwnerWg', '=', $GLOBALS['org_openpsa_core_workgroup_filter']); 
    212212        } 
    213         $ret = $_MIDCOM->dbfactory->exec_query_builder($qb); 
     213        $ret = $qb->execute(); 
    214214        if (   is_array($ret) 
    215215            && count($ret) > 0) 
    …… 
    226226 
    227227        // Tasks user is manager of that are pending approval 
    228         $qb = $_MIDCOM->dbfactory->new_query_builder('org_openpsa_projects_task'); 
     228        $qb = org_openpsa_projects_task::new_query_builder(); 
    229229        $qb->add_constraint('status', '=', ORG_OPENPSA_TASKSTATUS_COMPLETED); 
    230230        $qb->add_constraint('orgOpenpsaObtype', '=', ORG_OPENPSA_OBTYPE_TASK); 
    …… 
    250250 
    251251        // Tasks user is manager of that are on hold 
    252         $qb = $_MIDCOM->dbfactory->new_query_builder('org_openpsa_projects_task'); 
     252        $qb = org_openpsa_projects_task::new_query_builder(); 
    253253        $qb->add_constraint('status', '=', ORG_OPENPSA_TASKSTATUS_ONHOLD); 
    254254        $qb->add_constraint('orgOpenpsaObtype', '=', ORG_OPENPSA_OBTYPE_TASK); 
    …… 
    259259            $qb->add_constraint('orgOpenpsaOwnerWg', '=', $GLOBALS['org_openpsa_core_workgroup_filter']); 
    260260        } 
    261         $ret = $_MIDCOM->dbfactory->exec_query_builder($qb); 
     261        $ret = $qb->execute(); 
    262262        if (   is_array($ret) 
    263263            && count($ret) > 0) 

  • trunk/midcom/org.openpsa.projects/handler/task/resourcing.php

    r17567 r17904  
    1818     * The task to operate on 
    1919     * 
    20      * @var org_openpsa_projects_task_dba 
     20     * @var org_openpsa_projects_task 
    2121     * @access private 
    2222     */ 

  • trunk/midcom/org.openpsa.projects/midcom/interfaces.php

    r17901 r17904  
    350350    { 
    351351        debug_push_class(__CLASS__, __FUNCTION__); 
    352         if (!is_a($task, 'midcom_org_openpsa_task')) 
     352        if (!is_a($task, 'org_openpsa_projects_task')) 
    353353        { 
    354354            debug_add('given task is not really a task', MIDCOM_LOG_ERROR); 

  • trunk/midcom/org.openpsa.projects/project.php

    r17544 r17904  
    118118        $update_required = false; 
    119119        debug_add("Instantiating Query Builder for refreshing project information from tasks"); 
    120         $qb = $_MIDCOM->dbfactory->new_query_builder('org_openpsa_projects_task'); 
     120        $qb = org_openpsa_projects_task::new_query_builder(); 
    121121        $qb->add_constraint('up', '=', $this->id); 
    122122        debug_add("Executing Query Builder"); 
    123         $ret = $_MIDCOM->dbfactory->exec_query_builder($qb); 
     123        $ret = $qb->execute(); 
    124124        $task_statuses = Array(); 
    125125        $task_number = count($ret); 

  • trunk/midcom/org.openpsa.projects/projectbroker.php

    r17346 r17904  
    3030     * Does a local search for persons that match the task constraints 
    3131     * 
    32      * @param org_openpsa_projects_task $task org_openpsa_projects_task object to search prospect resources for 
     32     * @param org_openpsa_projects_task $task Task object to search prospect resources for 
    3333     * @return array of prospect persons (or false on critical failure) 
    3434     */ 

  • trunk/midcom/org.openpsa.projects/task.php

    r17607 r17904  
    1212 * @package org.openpsa.projects 
    1313 */ 
    14 class midcom_org_openpsa_task extends __midcom_org_openpsa_task 
     14class org_openpsa_projects_task extends __org_openpsa_projects_task 
    1515{ 
    1616    var $contacts = array(); //Shorthand access for contact members 
    …… 
    13571357 
    13581358} 
    1359  
    1360 /** 
    1361  * Another wrap level to get to component namespace 
    1362  * @package org.openpsa.projects 
    1363  */ 
    1364 class org_openpsa_projects_task extends midcom_org_openpsa_task 
    1365 { 
    1366     function __construct($identifier = NULL) 
    1367     { 
    1368         return parent::__construct($identifier); 
    1369     } 
    1370 } 
    13711359?> 

  • trunk/midcom/org.openpsa.relatedto/handler/relatedto.php

    r17901 r17904  
    246246                $this->_show_render_line_event(); 
    247247                break; 
    248             case is_a($this->_request_data['link_other_obj'], 'midcom_org_openpsa_task'): 
     248            case is_a($this->_request_data['link_other_obj'], 'org_openpsa_projects_task'): 
    249249                if ($this->_request_data['link_other_obj']->orgOpenpsaObtype == ORG_OPENPSA_OBTYPE_TASK) 
    250250                { 
    …… 
    978978            case is_a($obj, 'midcom_baseclasses_database_event'): 
    979979                return $obj->start; 
    980             case is_a($obj, 'midcom_org_openpsa_task'): 
     980            case is_a($obj, 'org_openpsa_projects_task'): 
    981981                return $obj->start; 
    982982            default: 

  • trunk/midcom/org.openpsa.reports/handler/projects/report.php

    r17363 r17904  
    8383        debug_add('Checking for children & recursing them'); 
    8484        debug_pop(); 
    85         $qb = $_MIDCOM->dbfactory->new_query_builder('org_openpsa_projects_task'); 
     85        $qb = org_openpsa_projects_task::new_query_builder(); 
    8686        $qb->add_constraint('up', '=', $task->id); 
    87         $results = $_MIDCOM->dbfactory->exec_query_builder($qb); 
     87        $results = $qb->execute(); 
    8888        if (is_array($results)) 
    8989        {