Changeset 17914

Show
Ignore:
Timestamp:
10/04/08 14:11:25 (2 months ago)
Author:
flack
Message:

remove more legacy wrappers and make the structure more autoloader-friendly

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/midcom/org.openpsa.mypage/handler/weekreview.php

    r17350 r17914  
    331331 
    332332                            break; 
    333                         case 'midcom_org_openpsa_task_status': 
     333                        case 'org_openpsa_projects_task_status': 
    334334                            midcom_show_style('weekreview-day-item-task-status'); 
    335335                            break; 

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

    r17904 r17914  
    99    'old_class_name' => null, 
    1010    'new_class_name' => 'org_openpsa_task_resource', 
    11     'midcom_class_name' => 'midcom_org_openpsa_task_resource' 
     11    'midcom_class_name' => 'org_openpsa_projects_task_resource' 
    1212), 
    1313array( 
    …… 
    3333    'old_class_name' => null, 
    3434    'new_class_name' => 'org_openpsa_task_status', 
    35     'midcom_class_name' => 'midcom_org_openpsa_task_status' 
     35    'midcom_class_name' => 'org_openpsa_projects_task_status' 
    3636), 

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

    r17904 r17914  
    246246            return; 
    247247        } 
    248         $qb = new midgard_query_builder('org_openpsa_task_resource'); 
     248        $qb = org_openpsa_projects_task_resource::new_query_builder(); 
    249249        //Target task starts or ends inside given events window or starts before and ends after 
    250250        $qb->begin_group('OR'); 
    …… 
    304304 
    305305    /** 
    306      * Used by org_openpsa_relatedto_find_suspects to in case the givcen object is a person 
     306     * Used by org_openpsa_relatedto_find_suspects to in case the given object is a person 
    307307     */ 
    308308    function _org_openpsa_relatedto_find_suspects_person(&$object, &$defaults, &$links_array) 
    …… 
    310310        debug_push_class(__CLASS__, __FUNCTION__); 
    311311        //List all projects and tasks given person is involved with 
    312         $qb = new midgard_query_builder('org_openpsa_task_resource'); 
     312        $qb = org_openpsa_projects_task_resource::new_query_builder(); 
    313313        $qb->add_constraint('person', '=', $object->id); 
    314314        /* This could reduce clutter somewhat with a minor risk of missing a link 

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

    r17904 r17914  
    282282        } 
    283283 
    284         $qb = new midgard_query_builder('org_openpsa_task_resource'); 
     284        $qb = org_openpsa_projects_task_resource::new_query_builder(); 
    285285        $qb->add_constraint('task', '=', $this->id); 
    286286        $qb->add_constraint('orgOpenpsaObtype', '<>', ORG_OPENPSA_OBTYPE_PROJECTPROSPECT); 
    …… 
    458458        //Find the correct eventmember by person ID 
    459459        //$qb = org_openpsa_task_resource::new_query_builder('org_openpsa_task_resource'); 
    460         $qb = new midgard_query_builder('org_openpsa_task_resource'); 
     460        $qb = org_openpsa_projects_task_resource::new_query_builder(); 
    461461        $qb->add_constraint('task', '=', $this->id); 
    462462        $qb->add_constraint('person', '=', $id); 

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

    • Property svn:mergeinfo set
    r17655 r17914  
    1212 * @package org.openpsa.projects 
    1313 */ 
    14 class midcom_org_openpsa_task_resource extends __midcom_org_openpsa_task_resource 
     14class org_openpsa_projects_task_resource extends __org_openpsa_projects_task_resource 
    1515{ 
    1616    var $_personobject; 
    …… 
    176176    } 
    177177} 
    178  
    179 /** 
    180  * Another wrap level to get to component namespace 
    181  *  
    182  * @package org.openpsa.projects 
    183  */ 
    184 class org_openpsa_projects_task_resource extends midcom_org_openpsa_task_resource 
    185 { 
    186     function __construct($identifier = NULL) 
    187     { 
    188         return parent::__construct($identifier); 
    189     } 
    190 } 
    191178?> 

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

    • Property svn:mergeinfo set
    r14613 r17914  
    1212 * @package org.openpsa.projects 
    1313 */ 
    14 class midcom_org_openpsa_task_status extends __midcom_org_openpsa_task_status 
     14class org_openpsa_projects_task_status extends __org_openpsa_projects_task_status 
    1515{ 
    1616    function __construct($id = null) 
    …… 
    4949 
    5050        //Check for duplicate(s) (for some reason at times the automagic actions in task object try to create duplicate statuses) 
    51         $qb = new midgard_query_builder('org_openpsa_task_status'); 
     51        $qb = org_openpsa_projects_task_status::new_query_builder(); 
    5252        $qb->add_constraint('task', '=', 'task'); 
    5353        $qb->add_constraint('type', '=', 'type'); 
    …… 
    107107} 
    108108 
    109 /** 
    110  * Another wrap level to get to component namespace 
    111  * @package org.openpsa.projects 
    112  */ 
    113 class org_openpsa_projects_task_status extends midcom_org_openpsa_task_status 
    114 { 
    115  
    116     function __construct($identifier=NULL) 
    117     { 
    118         return parent::__construct($identifier); 
    119     } 
    120  
    121 } 
    122  
    123109?>