Development

Changeset 5546

You must first sign up to be able to contribute.

Changeset 5546

Show
Ignore:
Timestamp:
10/16/07 14:46:24 (6 years ago)
Author:
pookey
Message:

updating for sf1.1

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/sfDoctrineSimpleCMSPlugin/trunk/config/doctrine/schema.yml

    r5545 r5546  
    4141      type:   integer 
    4242      length:   4 
    43       foreignClass: sfSimpleCMSPage 
    44       foreignReference: id 
    45       localName: sfSimpleCMSSlots 
    46       foreignName: page 
    4743      notnull:  true 
    4844      cascadeDelete: true 
    …… 
    7066    updated_at:  
    7167      type: timestamp 
     68  relations: 
     69    sfSimpleCMSSlots: 
     70      class: sfSimpleCMSPage 
     71      local: page_id 
     72      foreign: id 

  • plugins/sfDoctrineSimpleCMSPlugin/trunk/lib/model/doctrine/PluginsfSimpleCMSPageTable.class.php

    r5207 r5546  
    113113    $tree = $this->getTree()->fetchTree(); 
    114114    $page_names = array(); 
    115     foreach ($tree as $page) { 
     115    if ($tree) 
     116    { 
     117      foreach ($tree as $page) { 
    116118        $page_names[$page->slug] = str_repeat($indent_string, $page->level).$page->slug; 
     119      } 
    117120    } 
    118121    return $page_names; 

  • plugins/sfDoctrineSimpleCMSPlugin/trunk/modules/sfSimpleCMS/lib/BasesfSimpleCMSActions.class.php

    r4950 r5546  
    6464    { 
    6565      $this->checkEditorCredential(); 
    66       $page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug', sfConfig::get('app_sfSimpleCMS_default_page', 'home')), $culture); 
     66      $page = Doctrine_Manager::getInstance()->getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug', sfConfig::get('app_sfSimpleCMS_default_page', 'home')), $culture); 
    6767      if ($page->isLockedForUserId($this->getUser()->getGuardUser()->id)) 
    6868      { 
    …… 
    7474    else 
    7575    { 
    76       $page = sfDoctrine::getTable('sfSimpleCMSPage')->findPublicBySlug($this->getRequestParameter('slug', sfConfig::get('app_sfSimpleCMS_default_page', 'home')), $culture); 
     76      $page = Doctrine_Manager::getInstance()->getTable('sfSimpleCMSPage')->findPublicBySlug($this->getRequestParameter('slug', sfConfig::get('app_sfSimpleCMS_default_page', 'home')), $culture); 
    7777    } 
    7878 
    …… 
    9999  { 
    100100    $this->checkEditorCredential(); 
    101     $page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
     101    $page = Doctrine_Manager::getInstance()->getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
    102102    $this->forward404Unless($page); 
    103103     
    …… 
    150150     
    151151    $slug = $this->getRequestParameter('slug'); 
    152     $page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($slug); 
     152    $page = Doctrine_Manager::getInstance()->getTable('sfSimpleCMSPage')->findBySlug($slug); 
    153153    $this->forward404Unless($page); 
    154154     
    …… 
    184184    $page_id = $this->getRequestParameter('page_id'); 
    185185    $culture = $this->getCulture(); 
    186     $relative_page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('position')); 
     186    $relative_page = Doctrine_Manager::getInstance()->getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('position')); 
    187187    $positionType = $this->getRequestParameter('position_type'); 
    188188    if($relative_page && $relative_page->getNode()->isRoot() && $positionType != 'under') 
    …… 
    195195    { 
    196196      // update 
    197       $page = sfDoctrine::getTable('sfSimpleCMSPage')->find($page_id); 
     197      $page = Doctrine_Manager::getInstance()->getTable('sfSimpleCMSPage')->find($page_id); 
    198198      $this->forward404Unless($page); 
    199199       
    …… 
    247247 
    248248    $culture = $this->getCulture(); 
    249     $page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
     249    $page = Doctrine_Manager::getInstance()->getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
    250250    $this->forward404Unless($page); 
    251251     
    …… 
    265265 
    266266    $culture = $this->getCulture(); 
    267     $page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
     267    $page = Doctrine_Manager::getInstance()->getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
    268268    $this->forward404Unless($page); 
    269269     
    …… 
    280280 
    281281    $culture = $this->getCulture(); 
    282     $page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
     282    $page = Doctrine_Manager::getInstance()->getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
    283283    $this->forward404Unless($page); 
    284284 
    …… 
    291291   
    292292    $culture = $this->getCulture(); 
    293     $page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
     293    $page = Doctrine_Manager::getInstance()->getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
    294294    $this->forward404Unless($page); 
    295295   
    …… 
    312312   
    313313    $culture = $this->getCulture(); 
    314     $page = sfDoctrine::getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
     314    $page = Doctrine_Manager::getInstance()->getTable('sfSimpleCMSPage')->findBySlug($this->getRequestParameter('slug')); 
    315315    $this->forward404Unless($page); 
    316316