Development

Changeset 8871

You must first sign up to be able to contribute.

Changeset 8871

Show
Ignore:
Timestamp:
05/09/08 03:17:49 (3 days ago)
Author:
Jonathan.Todd
Message:

sfDoctrineNestedSetManagerPlugin: updated doctrine class calls to new standard

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/sfDoctrineNestedSetManagerPlugin/modules/sfNestedSetManager/actions/actions.class.php

    r4069 r8871  
    1616    if( $rootId ) 
    1717    { 
    18       $root = Doctrine_Manager::getInstance()->getTable($model)->getTree()->findRoot($rootId); 
     18      $root = Doctrine::getTable($model)->getTree()->findRoot($rootId); 
    1919     
    20       return Doctrine_Manager::getInstance()->getTable($model)->getTree()->fetchBranch($root->getId());  
     20      return Doctrine::getTable($model)->getTree()->fetchBranch($root->getId());  
    2121    } else { 
    22       return Doctrine_Manager::getInstance()->getTable($model)->getTree()->fetchTree(); 
     22      return Doctrine::getTable($model)->getTree()->fetchTree(); 
    2323    } 
    2424  } 
    …… 
    3030    $root = $this->getRequestParameter('root'); 
    3131 
    32     $record = Doctrine_Manager::getInstance()->getTable($model)->find($parent_id); 
     32    $record = Doctrine::getTable($model)->find($parent_id); 
    3333 
    3434    $child = new $model; 
    …… 
    4545    $root = new $model; 
    4646 
    47     Doctrine_Manager::getInstance()->getTable($model)->getTree()->createRoot($root); 
     47    Doctrine::getTable($model)->getTree()->createRoot($root); 
    4848    $this->records = $this->getTree($model); 
    4949  } 
    …… 
    5656    $value = $this->getRequestParameter('value'); 
    5757 
    58     $record = Doctrine_Manager::getInstance()->getTable($model)->find($id); 
     58    $record = Doctrine::getTable($model)->find($id); 
    5959    $record->set($field, $value); 
    6060    $record->save(); 
    …… 
    6969    $root = $this->getRequestParameter('root'); 
    7070     
    71     $record = Doctrine_Manager::getInstance()->getTable($model)->find($id); 
     71    $record = Doctrine::getTable($model)->find($id); 
    7272    $record->getNode()->delete(); 
    7373   
    …… 
    8282    $root = $this->getRequestParameter('root'); 
    8383     
    84     $record = Doctrine_Manager::getInstance()->getTable($model)->find($id); 
     84    $record = Doctrine::getTable($model)->find($id); 
    8585     
    8686    if( $direction == 'up' ) 
    …… 
    104104    $root = $this->getRequestParameter('root'); 
    105105     
    106     $record = Doctrine_Manager::getInstance()->getTable($model)->find($id); 
     106    $record = Doctrine::getTable($model)->find($id); 
    107107   
    108108    $this->records = $this->getTree($model, $root); 
    …… 
    116116    $root = $this->getRequestParameter('root'); 
    117117     
    118     $record = Doctrine_Manager::getInstance()->getTable($model)->find($id); 
    119     $record_to = Doctrine_Manager::getInstance()->getTable($model)->find($to_id); 
     118    $record = Doctrine::getTable($model)->find($id); 
     119    $record_to = Doctrine::getTable($model)->find($to_id); 
    120120 
    121121    $record->getNode()->moveAsFirstChildOf($record_to); 

  • plugins/sfDoctrineNestedSetManagerPlugin/modules/sfNestedSetManager/actions/components.class.php

    r4027 r8871  
    66    if( $rootId ) 
    77    { 
    8       $root = Doctrine_Manager::getInstance()->getTable($model)->getTree()->findRoot($rootId); 
     8      $root = Doctrine::getTable($model)->getTree()->findRoot($rootId); 
    99     
    10       return Doctrine_Manager::getInstance()->getTable($model)->getTree()->fetchBranch($root->getId());  
     10      return Doctrine::getTable($model)->getTree()->fetchBranch($root->getId());  
    1111    } else { 
    12       return Doctrine_Manager::getInstance()->getTable($model)->getTree()->fetchTree(); 
     12      return Doctrine::getTable($model)->getTree()->fetchTree(); 
    1313    } 
    1414  }