To participate you must create an account on apostrophenow.org. If you have already done so, click Login.

Show
Ignore:
Timestamp:
07/21/10 15:51:42 (22 months ago)
Author:
dordille
Message:

Merged various fixes from branch into trunk.

Location:
plugins/apostropheBlogPlugin/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • plugins/apostropheBlogPlugin/trunk

  • plugins/apostropheBlogPlugin/trunk/lib/form/doctrine/PluginaBlogItemForm.class.php

    r1744 r1816  
    3838    } 
    3939 
    40     if(!$user->hasCredential('admin')) 
    41     { 
    42       unset($this['author_id']); 
    43     } 
    44  
    45     $templates = sfConfig::get('app_'.$this->engine.'_templates'); 
     40    $templates = sfConfig::get('app_'.$this->engine.'_templates', $this->getObject()->getTemplateDefaults()); 
    4641    $templateChoices = array(); 
    4742          foreach ($templates as $key => $template) 
    … …  
    8984    } 
    9085 
    91     $q = Doctrine::getTable('sfGuardUser')->createQuery('u'); 
    92  
    93     if ($candidateGroup && $sufficientGroup) 
    94     { 
    95       $q->leftJoin('u.groups g')->addWhere('(g.name IN (?, ?)) OR (u.is_super_admin IS TRUE)', array($candidateGroup, $sufficientGroup)); 
    96     } 
    97     $this->setWidget('author_id', 
    98       new sfWidgetFormDoctrineChoice(array('model' => 'sfGuardUser', 'query' => $q))); 
    99     $this->setValidator('author_id', 
    100       new sfValidatorDoctrineChoice(array('model' => 'sfGuardUser', 'query' => $q, 'required' => false))); 
     86    if($user->hasCredential('admin')) 
     87    { 
     88      $q = Doctrine::getTable('sfGuardUser')->createQuery('u'); 
     89 
     90      if ($candidateGroup && $sufficientGroup) 
     91      { 
     92        $q->leftJoin('u.groups g')->addWhere('(g.name IN (?, ?)) OR (u.is_super_admin IS TRUE)', array($candidateGroup, $sufficientGroup)); 
     93      } 
     94      $this->setWidget('author_id', 
     95        new sfWidgetFormDoctrineChoice(array('model' => 'sfGuardUser', 'query' => $q))); 
     96      $this->setValidator('author_id', 
     97        new sfValidatorDoctrineChoice(array('model' => 'sfGuardUser', 'query' => $q, 'required' => false))); 
     98    } 
     99    else 
     100    { 
     101      unset($this['author_id']); 
     102    } 
    101103 
    102104    $this->setWidget('published_at', new sfWidgetFormJQueryDateTime( 
    … …  
    106108    $this->getWidgetSchema()->setDefault('published_at', date('Y-m-d H:i:s')); 
    107109 
    108     // $this->widgetSchema['tags']       = new sfWidgetFormInput(array('default' => implode(', ', $this->getObject()->getTags())), array('class' => 'tag-input', 'autocomplete' => 'off')); 
    109     // $this->validatorSchema['tags']    = new sfValidatorString(array('required' => false)); 
     110    //$this->widgetSchema['tags']       = new sfWidgetFormInput(array('default' => implode(', ', $this->getObject()->getTags())), array('class' => 'tag-input', 'autocomplete' => 'off')); 
     111    //$this->validatorSchema['tags']    = new sfValidatorString(array('required' => false)); 
    110112 
    111113    $this->validatorSchema->setPostValidator( 
    … …  
    157159  protected function doSave($con = null) 
    158160  { 
    159     $tags = $this->values['tags']; 
    160     $tags = preg_replace('/\s\s+/', ' ', $tags); 
    161     $tags = str_replace(', ', ',', $tags); 
    162  
    163     $this->object->setTags($tags); 
    164161    if(isset($this['categories_list_add'])) 
    165162    {