Changeset 17930

Show
Ignore:
Timestamp:
10/05/08 16:39:59 (2 months ago)
Author:
flack
Message:

remove legacy wrappers for o.o.person and o.o.group

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/midcom/org.maemo.gforgeprofileupdater/config/manifest.inc

    r15057 r17930  
    3434        ( 
    3535            'midcom_baseclasses_database_person', 
    36             'midcom_org_openpsa_person', 
     36            'org_openpsa_contacts_person', 
    3737        ), 
    3838        'operations' => MIDCOM_OPERATION_DBA_ALL, 

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

    r3799 r17930  
    33    'old_class_name' => null, 
    44    'new_class_name' => 'org_openpsa_organization', 
    5     'midcom_class_name' => 'midcom_org_openpsa_organization' 
     5    'midcom_class_name' => 'org_openpsa_contacts_group' 
    66), 
    77array( 
    …… 
    99    'old_class_name' => null, 
    1010    'new_class_name' => 'org_openpsa_person', 
    11     'midcom_class_name' => 'midcom_org_openpsa_person' 
     11    'midcom_class_name' => 'org_openpsa_contacts_person' 
    1212), 
    1313array( 

  • trunk/midcom/org.openpsa.contacts/group.php

    r17101 r17930  
    66 * @license http://www.gnu.org/licenses/gpl.html GNU General Public License 
    77 */ 
    8 // TODO Hotfix 
    98 
    109/** 
    1110 * @package org.openpsa.contacts 
    1211 */ 
    13 class midcom_org_openpsa_organization extends __midcom_org_openpsa_organization 
     12class org_openpsa_contacts_group extends __org_openpsa_contacts_group 
    1413{ 
    15     function __construct($id = null) 
     14    var $members = array(); 
     15    var $members_loaded = false; 
     16 
     17    function __construct($identifier=NULL) 
    1618    { 
    17         return parent::__construct($id); 
     19        return parent::__construct($identifier); 
    1820    } 
    1921 
    …… 
    4446 
    4547        return $property; 
    46     } 
    47 } 
    48  
    49 /** 
    50  * Wrapper group 
    51  */ 
    52 class org_openpsa_contacts_group extends midcom_org_openpsa_organization 
    53 { 
    54     var $members = array(); 
    55     var $members_loaded = false; 
    56  
    57     function __construct($identifier=NULL) 
    58     { 
    59         return parent::__construct($identifier); 
    6048    } 
    6149 

  • trunk/midcom/org.openpsa.contacts/handler/search.php

    r17659 r17930  
    154154 
    155155        $qb_org = org_openpsa_contacts_group::new_query_builder(); 
    156         //$qb_org = new MidgardQuerybuilder('org_openpsa_organization'); 
    157156        $qb_org->begin_group('OR'); 
    158157 

  • trunk/midcom/org.openpsa.contacts/person.php

    r17105 r17930  
    1111 * @package org.openpsa.contacts 
    1212 */ 
    13 class midcom_org_openpsa_person extends __midcom_org_openpsa_person 
     13class org_openpsa_contacts_person extends __org_openpsa_contacts_person 
    1414{ 
    1515    var $name; //Compound of firstname, lastname and username 
    …… 
    317317} 
    318318 
    319  
    320 /** 
    321  * org.openpsa.contacts specific wrapper to org_openpsa_person 
    322  * @package org.openpsa.contacts 
    323  */ 
    324 class org_openpsa_contacts_person extends midcom_org_openpsa_person 
    325 { 
    326     function __construct($identifier=NULL) 
    327     { 
    328         return parent::__construct($identifier); 
    329     } 
    330 } 
    331  
    332319?> 

  • trunk/midcom/org.openpsa.contactwidget/main.php

    r17354 r17930  
    112112        if (   !is_object($person) 
    113113            && !is_a($person, 'midcom_baseclasses_database_person') 
    114             && !is_a($person, 'midcom_org_openpsa_person') 
     114            && !is_a($person, 'org_openpsa_contacts_person') 
    115115            ) 
    116116        { 

  • trunk/midcom/org.openpsa.directmarketing/campaign_ruleresolver.php

    r17556 r17930  
    220220            { 
    221221                //We need to fill the seek table, thus this no-op here (matches org_openpsa_contacts_person as well) 
    222                 case is_a($obj, 'midcom_org_openpsa_person'): 
     222                case is_a($obj, 'org_openpsa_contacts_person'): 
    223223                    break; 
    224224                //Make all other persons org_openpsa_contacts_persons 

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

    r17928 r17930  
    209209        { 
    210210            case is_a($object, 'midcom_baseclasses_database_person'): 
    211             case is_a($object, 'midcom_org_openpsa_person'): 
     211            case is_a($object, 'org_openpsa_contacts_person'): 
    212212                $this->_org_openpsa_relatedto_find_suspects_person($object, $defaults, $links_array); 
    213213                break; 

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

    r17904 r17930  
    4545            'midgard_person', 
    4646            'midcom_db_person', 
    47             'midcom_org_openpsa_person', 
    4847            'org_openpsa_contacts_person', 
    4948        ); 
    …… 
    7170            switch (true) 
    7271            { 
    73                 case (is_a($obj, 'midcom_org_openpsa_person')): 
     72                case (is_a($obj, 'org_openpsa_contacts_person')): 
    7473                    $return[] = $obj; 
    7574                    break; 

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

    r17928 r17930  
    439439        $qb->begin_group('OR'); 
    440440            $qb->add_constraint('toClass', '=', 'midcom_db_person'); 
    441             $qb->add_constraint('toClass', '=', 'midcom_org_openpsa_person'); 
    442441            $qb->add_constraint('toClass', '=', 'org_openpsa_contacts_person'); 
    443442        $qb->end_group(); 

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

    r17928 r17930  
    9797            case is_a($object, 'midcom_baseclasses_database_person'): 
    9898                //Fall-trough intentional 
    99             case is_a($object, 'midcom_org_openpsa_person'): 
     99            case is_a($object, 'org_openpsa_contacts_person'): 
    100100                //List all projects and tasks given person is involved with 
    101101                $this->_org_openpsa_relatedto_find_suspects_person($object, $defaults, $links_array);