Author: annis
Date: 2010-03-25 18:03:01 +0100 (Thu, 25 Mar 2010)
New Revision: 28789

Modified:
   
plugins/ahAdminGeneratorThemesPlugin/trunk/config/ahAdminGeneratorThemesPluginConfiguration.class.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/archiveAction.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/archiveReactivateBatchAction.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/batchAction.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/createAction.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/deleteAction.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/editAction.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/fieldsConfiguration.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/newAction.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/processFormAction.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/reactivateAction.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/showAction.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/showConfiguration.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/updateAction.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/lib/helper.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_filters.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_form.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list_td_actions.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list_td_batch_actions.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_show.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_show_actions.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/editSuccess.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/indexSuccess.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/newSuccess.php
   
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/showSuccess.php
Log:
Merge branch 'master' into HEAD

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/config/ahAdminGeneratorThemesPluginConfiguration.class.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/config/ahAdminGeneratorThemesPluginConfiguration.class.php
       2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/config/ahAdminGeneratorThemesPluginConfiguration.class.php
       2010-03-25 17:03:01 UTC (rev 28789)
@@ -5,7 +5,7 @@
  * 
  * @package     ahAdminGeneratorThemesPlugin
  * @subpackage  config
- * @author      Daniel Lohse <[email protected]>
+ * @author      Daniel Lohse <[email protected]>
  */
 class ahAdminGeneratorThemesPluginConfiguration extends sfPluginConfiguration
 {

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/archiveAction.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/archiveAction.php
        2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/archiveAction.php
        2010-03-25 17:03:01 UTC (rev 28789)
@@ -4,14 +4,14 @@
 
     $this->dispatcher->notify(new sfEvent($this, 'admin.archive_object', 
array('object' => $this->getRoute()->getObject())));
 
-    $this-><?php echo $this->getSingularName() ?> = 
$this->getRoute()->getObject();
+    $this-><?php echo ahToolkit::variablize($this->getSingularName()) ?> = 
$this->getRoute()->getObject();
     
-    $this-><?php echo $this->getSingularName() ?>->setIsArchived(true);
+    $this-><?php echo ahToolkit::variablize($this->getSingularName()) 
?>->setIsArchived(true);
     
-    $this-><?php echo $this->getSingularName() ?>->save();
+    $this-><?php echo ahToolkit::variablize($this->getSingularName()) 
?>->save();
     
-    ahToolkit::setFlash(ucfirst(Doctrine::getTable('<?php echo 
$this->getModelClass() ?>')->getSingularName()).' %1% successfully archived', 
-      array('%1%' => '&raquo;'.$this-><?php echo $this->getSingularName() 
?>.'&laquo;'));
+    ahToolkit::setFlash(ucfirst('<?php echo $this->getSingularName() ?>').' 
%1% successfully archived', 
+      array('%1%' => '&raquo;'.$this-><?php echo 
ahToolkit::variablize($this->getSingularName()) ?>.'&laquo;'));
 
     $this->redirect($this->getUser()->getNextRedirect());
   }

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/archiveReactivateBatchAction.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/archiveReactivateBatchAction.php
 2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/archiveReactivateBatchAction.php
 2010-03-25 17:03:01 UTC (rev 28789)
@@ -3,7 +3,7 @@
     $ids = $request->getParameter('ids');
     
     $model_class = '<?php echo $this->getModelClass() ?>';
-    $model_plural_name = Doctrine::getTable($model_class)->getPluralName();
+    $model_plural_name = '<?php echo $this->getPluralName() ?>';
  
     $q = Doctrine_Query::create()
       ->from($model_class.' ba')

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/batchAction.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/batchAction.php
  2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/batchAction.php
  2010-03-25 17:03:01 UTC (rev 28789)
@@ -3,8 +3,8 @@
     $request->checkCSRFProtection();
     
     $model_class = '<?php echo $this->getModelClass() ?>';
-    $model_singular_name = Doctrine::getTable($model_class)->getSingularName();
-    $model_plural_name = Doctrine::getTable($model_class)->getPluralName();
+    $model_singular_name = '<?php echo $this->getSingularName() ?>';
+    $model_plural_name = '<?php echo $this->getPluralName() ?>';
 
     if (!$ids = $request->getParameter('ids'))
     {
@@ -53,7 +53,7 @@
     $ids = $request->getParameter('ids');
     
     $model_class = '<?php echo $this->getModelClass() ?>';
-    $model_plural_name = Doctrine::getTable($model_class)->getPluralName();
+    $model_plural_name = '<?php echo $this->getPluralName() ?>';
 
     $records = Doctrine_Query::create()
       ->from($model_class)

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/createAction.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/createAction.php
 2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/createAction.php
 2010-03-25 17:03:01 UTC (rev 28789)
@@ -1,7 +1,7 @@
   public function executeCreate(sfWebRequest $request)
   {
     $this->form = $this->configuration->getNewForm();
-    $this-><?php echo $this->getSingularName() ?> = $this->form->getObject();
+    $this-><?php echo ahToolkit::variablize($this->getSingularName()) ?> = 
$this->form->getObject();
 
     $this->processForm($request, $this->form);
 

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/deleteAction.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/deleteAction.php
 2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/deleteAction.php
 2010-03-25 17:03:01 UTC (rev 28789)
@@ -10,7 +10,7 @@
 
     $object->delete();
     
-    ahToolkit::setFlash(ucfirst(Doctrine::getTable('<?php echo 
$this->getModelClass() ?>')->getSingularName()).' %1% successfully deleted', 
+    ahToolkit::setFlash(ucfirst('<?php echo $this->getSingularName() ?>').' 
%1% successfully deleted', 
       array('%1%' => '&raquo;'.$object_representation.'&laquo;'));
 
     $this->redirect($this->getUser()->getNextRedirect());

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/editAction.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/editAction.php
   2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/editAction.php
   2010-03-25 17:03:01 UTC (rev 28789)
@@ -1,5 +1,5 @@
   public function executeEdit(sfWebRequest $request)
   {
-    $this-><?php echo $this->getSingularName() ?> = 
$this->getRoute()->getObject();
-    $this->form = $this->configuration->getEditForm($this-><?php echo 
$this->getSingularName() ?>);
+    $this-><?php echo ahToolkit::variablize($this->getSingularName()) ?> = 
$this->getRoute()->getObject();
+    $this->form = $this->configuration->getEditForm($this-><?php echo 
ahToolkit::variablize($this->getSingularName()) ?>);
   }

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/fieldsConfiguration.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/fieldsConfiguration.php
  2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/fieldsConfiguration.php
  2010-03-25 17:03:01 UTC (rev 28789)
@@ -12,19 +12,19 @@
 
   public function getListTitle()
   {
-    return '<?php echo 
$this->escapeString(isset($this->config['list']['title']) ? 
$this->config['list']['title'] : 
ucfirst(Doctrine::getTable($this->getModelClass())->getSingularName()).' List') 
?>';
+    return '<?php echo 
$this->escapeString(isset($this->config['list']['title']) ? 
$this->config['list']['title'] : ucfirst($this->getSingularName()).' List') ?>';
 <?php unset($this->config['list']['title']) ?>
   }
 
   public function getEditTitle()
   {
-    return '<?php echo 
$this->escapeString(isset($this->config['edit']['title']) ? 
$this->config['edit']['title'] : 'Edit 
'.ucfirst(Doctrine::getTable($this->getModelClass())->getSingularName())) ?>';
+    return '<?php echo 
$this->escapeString(isset($this->config['edit']['title']) ? 
$this->config['edit']['title'] : 'Edit '.ucfirst($this->getSingularName())) ?>';
 <?php unset($this->config['edit']['title']) ?>
   }
 
   public function getNewTitle()
   {
-    return '<?php echo 
$this->escapeString(isset($this->config['new']['title']) ? 
$this->config['new']['title'] : 'New 
'.ucfirst(Doctrine::getTable($this->getModelClass())->getSingularName())) ?>';
+    return '<?php echo 
$this->escapeString(isset($this->config['new']['title']) ? 
$this->config['new']['title'] : 'New '.ucfirst($this->getSingularName())) ?>';
 <?php unset($this->config['new']['title']) ?>
   }
 

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/newAction.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/newAction.php
    2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/newAction.php
    2010-03-25 17:03:01 UTC (rev 28789)
@@ -1,5 +1,5 @@
   public function executeNew(sfWebRequest $request)
   {
     $this->form = $this->configuration->getNewForm();
-    $this-><?php echo $this->getSingularName() ?> = $this->form->getObject();
+    $this-><?php echo ahToolkit::variablize($this->getSingularName()) ?> = 
$this->form->getObject();
   }

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/processFormAction.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/processFormAction.php
    2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/processFormAction.php
    2010-03-25 17:03:01 UTC (rev 28789)
@@ -5,7 +5,7 @@
     {
       $is_new = $form->getObject()->isNew();
       try {
-        $<?php echo $this->getSingularName() ?> = $form->save();
+        $<?php echo ahToolkit::variablize($this->getSingularName()) ?> = 
$form->save();
       } catch (Doctrine_Validator_Exception $e) {
 
         $errorStack = $form->getObject()->getErrorStack();
@@ -20,18 +20,18 @@
         return sfView::SUCCESS;
       }
 
-      $this->dispatcher->notify(new sfEvent($this, 'admin.save_object', 
array('object' => $<?php echo $this->getSingularName() ?>)));
+      $this->dispatcher->notify(new sfEvent($this, 'admin.save_object', 
array('object' => $<?php echo ahToolkit::variablize($this->getSingularName()) 
?>)));
 
       if ($request->hasParameter('_save_and_add'))
       {
-        
ahToolkit::setFlash(ucfirst(Doctrine::getTable($form->getModelName())->getSingularName()).'
 %1% successfully '.($is_new ? 'created' : 'updated'), 
+        ahToolkit::setFlash(ucfirst('<?php echo $this->getSingularName() 
?>').' %1% successfully '.($is_new ? 'created' : 'updated'), 
           array('%1%' => '&raquo;'.$form->getObject().'&laquo;'));
 
         $this->redirect('@<?php echo $this->getUrlForAction('new') ?>');
       }
       else
       {
-        
ahToolkit::setFlash(ucfirst(Doctrine::getTable($form->getModelName())->getSingularName()).'
 %1% successfully '.($is_new ? 'created' : 'updated'), 
+        ahToolkit::setFlash(ucfirst('<?php echo $this->getSingularName() 
?>').' %1% successfully '.($is_new ? 'created' : 'updated'), 
           array('%1%' => '&raquo;'.$form->getObject().'&laquo;'));
 
         $this->redirect($this->getUser()->getNextRedirect());

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/reactivateAction.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/reactivateAction.php
     2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/reactivateAction.php
     2010-03-25 17:03:01 UTC (rev 28789)
@@ -2,16 +2,16 @@
   {
     $request->checkCSRFProtection();
     
-    $this-><?php echo $this->getSingularName() ?> = 
$this->getRoute()->getObject();
+    $this-><?php echo ahToolkit::variablize($this->getSingularName()) ?> = 
$this->getRoute()->getObject();
 
-    $this->dispatcher->notify(new sfEvent($this, 'admin.reactivate_object', 
array('object' => $this-><?php echo $this->getSingularName() ?>)));
+    $this->dispatcher->notify(new sfEvent($this, 'admin.reactivate_object', 
array('object' => $this-><?php echo 
ahToolkit::variablize($this->getSingularName()) ?>)));
     
-    $this-><?php echo $this->getSingularName() ?>->setIsArchived(false);
+    $this-><?php echo ahToolkit::variablize($this->getSingularName()) 
?>->setIsArchived(false);
     
-    $this-><?php echo $this->getSingularName() ?>->save();
+    $this-><?php echo ahToolkit::variablize($this->getSingularName()) 
?>->save();
     
-    ahToolkit::setFlash(ucfirst(Doctrine::getTable('<?php echo 
$this->getModelClass() ?>')->getSingularName()).' %1% successfully 
reactivated', 
-      array('%1%' => '&raquo;'.$this-><?php echo $this->getSingularName() 
?>.'&laquo;'));
+    ahToolkit::setFlash(ucfirst('<?php echo $this->getSingularName() ?>').' 
%1% successfully reactivated', 
+      array('%1%' => '&raquo;'.$this-><?php echo 
ahToolkit::variablize($this->getSingularName()) ?>.'&laquo;'));
 
     $this->redirect($this->getUser()->getNextRedirect());
   }

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/showAction.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/showAction.php
   2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/showAction.php
   2010-03-25 17:03:01 UTC (rev 28789)
@@ -1,5 +1,5 @@
   public function executeShow(sfWebRequest $request)
   {
-    $this-><?php echo $this->getSingularName() ?> = 
$this->getRoute()->getObject();
-    
$this->getUser()->setNextRedirect($this->getController()->genUrl(array('sf_route'
 => '<?php echo $this->getUrlForAction('show') ?>', 'sf_subject' => 
$this-><?php echo $this->getSingularName() ?>)));
+    $this-><?php echo ahToolkit::variablize($this->getSingularName()) ?> = 
$this->getRoute()->getObject();
+    
$this->getUser()->setNextRedirect($this->getController()->genUrl(array('sf_route'
 => '<?php echo $this->getUrlForAction('show') ?>', 'sf_subject' => 
$this-><?php echo ahToolkit::variablize($this->getSingularName()) ?>)));
   }

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/showConfiguration.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/showConfiguration.php
    2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/showConfiguration.php
    2010-03-25 17:03:01 UTC (rev 28789)
@@ -61,7 +61,7 @@
 
   public function getShowTitle()
   {
-    return '<?php echo 
$this->escapeString(isset($this->config['show']['title']) ? 
$this->config['show']['title'] : 
ucfirst(Doctrine::getTable($this->getModelClass())->getSingularName()).' 
Details') ?>';
+    return '<?php echo 
$this->escapeString(isset($this->config['show']['title']) ? 
$this->config['show']['title'] : ucfirst($this->getSingularName()).' Details') 
?>';
 <?php unset($this->config['show']['title']) ?>
   }
 

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/updateAction.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/updateAction.php
 2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/updateAction.php
 2010-03-25 17:03:01 UTC (rev 28789)
@@ -1,7 +1,7 @@
   public function executeUpdate(sfWebRequest $request)
   {
-    $this-><?php echo $this->getSingularName() ?> = 
$this->getRoute()->getObject();
-    $this->form = $this->configuration->getEditForm($this-><?php echo 
$this->getSingularName() ?>);
+    $this-><?php echo ahToolkit::variablize($this->getSingularName()) ?> = 
$this->getRoute()->getObject();
+    $this->form = $this->configuration->getEditForm($this-><?php echo 
ahToolkit::variablize($this->getSingularName()) ?>);
 
     $this->processForm($request, $this->form);
 

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/lib/helper.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/lib/helper.php
        2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/lib/helper.php
        2010-03-25 17:03:01 UTC (rev 28789)
@@ -50,7 +50,7 @@
 
   public function linkToList($params)
   {
-    return link_to(__($params['label'], array(), 'sf_admin'), 
sfContext::getInstance()->getUser()->getNextRedirect(false));
+    return link_to(__($params['label'], array(), 'sf_admin'), 
$this->getUrlForAction('list'));
   }
 
   public function linkToSave($object, $params)

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_filters.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_filters.php
        2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_filters.php
        2010-03-25 17:03:01 UTC (rev 28789)
@@ -21,7 +21,7 @@
 [?php end_slot(); ?]
 
 <div class="filter_form">
-  <h3>[?php echo ucfirst(__('Filter '.$form->getTable()->getPluralName())) 
?]</h3>
+  <h3>[?php echo ucfirst(__('Filter <?php echo $this->getPluralName() ?>')) 
?]</h3>
   <form action="[?php echo url_for('<?php echo 
$this->getUrlForAction('collection') ?>', array('action' => 'filter')) ?]" 
method="post">
     <table>
       <thead>
@@ -33,7 +33,7 @@
       <tr>
         [?php include_slot('form_filter_fields') ?]  
         <td>
-          <input type="submit" value="[?php echo __('Filter 
'.$form->getTable()->getPluralName(), array(), 'messages') ?]" />&nbsp;&nbsp;
+          <input type="submit" value="[?php echo __('Filter <?php echo 
$this->getPluralName() ?>', array(), 'messages') ?]" />&nbsp;&nbsp;
           [?php echo link_to(__('Reset', array(), 'sf_admin'), '<?php echo 
$this->getUrlForAction('collection') ?>', array('action' => 'filter'), 
array('query_string' => '_reset', 'method' => 'post')) ?]
           [?php echo $form->renderHiddenFields() ?]
         </td>

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_form.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_form.php
   2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_form.php
   2010-03-25 17:03:01 UTC (rev 28789)
@@ -10,11 +10,11 @@
     [?php endif; ?]
 
     [?php foreach ($configuration->getFormFields($form, $form->isNew() ? 'new' 
: 'edit') as $fieldset => $fields): ?]
-      [?php include_partial('<?php echo $this->getModuleName() 
?>/form_fieldset', array('<?php echo $this->getSingularName() ?>' => $<?php 
echo $this->getSingularName() ?>, 'form' => $form, 'fields' => $fields, 
'fieldset' => $fieldset)) ?]
+      [?php include_partial('<?php echo $this->getModuleName() 
?>/form_fieldset', array('<?php echo 
ahToolkit::variablize($this->getSingularName()) ?>' => $<?php echo 
ahToolkit::variablize($this->getSingularName()) ?>, 'form' => $form, 'fields' 
=> $fields, 'fieldset' => $fieldset)) ?]
     [?php endforeach; ?]
 
     <fieldset class="sf_fieldset_form_actions">
-      [?php include_partial('<?php echo $this->getModuleName() 
?>/form_actions', array('<?php echo $this->getSingularName() ?>' => $<?php echo 
$this->getSingularName() ?>, 'form' => $form, 'configuration' => 
$configuration, 'helper' => $helper)) ?]
+      [?php include_partial('<?php echo $this->getModuleName() 
?>/form_actions', array('<?php echo 
ahToolkit::variablize($this->getSingularName()) ?>' => $<?php echo 
ahToolkit::variablize($this->getSingularName()) ?>, 'form' => $form, 
'configuration' => $configuration, 'helper' => $helper)) ?]
     </fieldset>
   </form>
 </div>

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list.php
   2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list.php
   2010-03-25 17:03:01 UTC (rev 28789)
@@ -29,14 +29,14 @@
         </tr>
       </tfoot>
       <tbody>
-        [?php foreach ($pager->getResults() as $i => $<?php echo 
$this->getSingularName() ?>): $odd = fmod(++$i, 2) ? 'odd' : 'even' ?]
+        [?php foreach ($pager->getResults() as $i => $<?php echo 
ahToolkit::variablize($this->getSingularName()) ?>): $odd = fmod(++$i, 2) ? 
'odd' : 'even' ?]
           <tr class="sf_admin_row [?php echo $odd ?]">
 <?php if ($this->configuration->getValue('list.batch_actions')): ?>
-            [?php include_partial('<?php echo $this->getModuleName() 
?>/list_td_batch_actions', array('<?php echo $this->getSingularName() ?>' => 
$<?php echo $this->getSingularName() ?>, 'helper' => $helper)) ?]
+            [?php include_partial('<?php echo $this->getModuleName() 
?>/list_td_batch_actions', array('<?php echo 
ahToolkit::variablize($this->getSingularName()) ?>' => $<?php echo 
ahToolkit::variablize($this->getSingularName()) ?>, 'helper' => $helper)) ?]
 <?php endif; ?>
-            [?php include_partial('<?php echo $this->getModuleName() 
?>/list_td_<?php echo $this->configuration->getValue('list.layout') ?>', 
array('<?php echo $this->getSingularName() ?>' => $<?php echo 
$this->getSingularName() ?>, 'helper' => $helper)) ?]
+            [?php include_partial('<?php echo $this->getModuleName() 
?>/list_td_<?php echo $this->configuration->getValue('list.layout') ?>', 
array('<?php echo ahToolkit::variablize($this->getSingularName()) ?>' => $<?php 
echo ahToolkit::variablize($this->getSingularName()) ?>, 'helper' => $helper)) 
?]
 <?php if ($this->configuration->getValue('list.object_actions')): ?>
-            [?php include_partial('<?php echo $this->getModuleName() 
?>/list_td_actions', array('<?php echo $this->getSingularName() ?>' => $<?php 
echo $this->getSingularName() ?>, 'helper' => $helper)) ?]
+            [?php include_partial('<?php echo $this->getModuleName() 
?>/list_td_actions', array('<?php echo 
ahToolkit::variablize($this->getSingularName()) ?>' => $<?php echo 
ahToolkit::variablize($this->getSingularName()) ?>, 'helper' => $helper)) ?]
 <?php endif; ?>
           </tr>
         [?php endforeach; ?]

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list_td_actions.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list_td_actions.php
        2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list_td_actions.php
        2010-03-25 17:03:01 UTC (rev 28789)
@@ -1,20 +1,20 @@
 <td>
   <?php foreach ($this->configuration->getValue('list.object_actions') as 
$name => $params): ?>
     <?php if ('_delete' == $name): ?>
-      <?php echo $this->addCredentialCondition('[?php echo 
$helper->linkToDelete($'.$this->getSingularName().', '.$this->asPhp($params).') 
?]', $params) ?>
+      <?php echo $this->addCredentialCondition('[?php echo 
$helper->linkToDelete($'.ahToolkit::variablize($this->getSingularName()).', 
'.$this->asPhp($params).') ?]', $params) ?>
   
     <?php elseif ('_edit' == $name): ?>
-      <?php echo $this->addCredentialCondition('[?php echo 
$helper->linkToEdit($'.$this->getSingularName().', '.$this->asPhp($params).') 
?]', $params) ?>
+      <?php echo $this->addCredentialCondition('[?php echo 
$helper->linkToEdit($'.ahToolkit::variablize($this->getSingularName()).', 
'.$this->asPhp($params).') ?]', $params) ?>
     
     <?php elseif ('_show' == $name): ?>
-      <?php echo $this->addCredentialCondition('[?php echo 
$helper->linkToShow($'.$this->getSingularName().', '.$this->asPhp($params).') 
?]', $params) ?>
+      <?php echo $this->addCredentialCondition('[?php echo 
$helper->linkToShow($'.ahToolkit::variablize($this->getSingularName()).', 
'.$this->asPhp($params).') ?]', $params) ?>
     
     <?php elseif ('_archive' == $name): ?>
-      <?php echo $this->addCredentialCondition('[?php echo 
$helper->linkToArchive($'.$this->getSingularName().', 
'.$this->asPhp($params).') ?]', $params) ?>
+      <?php echo $this->addCredentialCondition('[?php echo 
$helper->linkToArchive($'.ahToolkit::variablize($this->getSingularName()).', 
'.$this->asPhp($params).') ?]', $params) ?>
   
     <?php else: ?>
       [?php if (method_exists($helper, 'linkTo<?php echo ucfirst(ltrim($name, 
'_')) ?>')): ?>
-        <?php echo $this->addCredentialCondition('[?php echo 
$helper->linkTo'.ucfirst(ltrim($name, '_')).'($'.$this->getSingularName().', 
'.$this->asPhp($params).') ?]', $params) ?>
+        <?php echo $this->addCredentialCondition('[?php echo 
$helper->linkTo'.ucfirst(ltrim($name, 
'_')).'($'.ahToolkit::variablize($this->getSingularName()).', 
'.$this->asPhp($params).') ?]', $params) ?>
       [?php else: ?]
         <?php echo $this->addCredentialCondition($this->getLinkToAction($name, 
$params, true), $params) ?>
       [?php endif; ?]

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list_td_batch_actions.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list_td_batch_actions.php
  2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list_td_batch_actions.php
  2010-03-25 17:03:01 UTC (rev 28789)
@@ -1,3 +1,3 @@
 <td>
-  <input type="checkbox" name="ids[]" value="[?php echo $<?php echo 
$this->getSingularName() ?>->getPrimaryKey() ?]" 
class="sf_admin_batch_checkbox" />
+  <input type="checkbox" name="ids[]" value="[?php echo $<?php echo 
ahToolkit::variablize($this->getSingularName()) ?>->getPrimaryKey() ?]" 
class="sf_admin_batch_checkbox" />
 </td>

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_show.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_show.php
   2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_show.php
   2010-03-25 17:03:01 UTC (rev 28789)
@@ -2,7 +2,7 @@
   [?php if (has_component_slot('show_header')) 
include_component_slot('show_header') ?]
   <table>
     <tbody>
-      [?php include_partial('<?php echo $this->getModuleName() 
?>/show_tr_<?php echo $this->configuration->getValue('list.layout') ?>', 
array('<?php echo $this->getSingularName() ?>' => $<?php echo 
$this->getSingularName() ?>, 'helper' => $helper)) ?]
+      [?php include_partial('<?php echo $this->getModuleName() 
?>/show_tr_<?php echo $this->configuration->getValue('list.layout') ?>', 
array('<?php echo ahToolkit::variablize($this->getSingularName()) ?>' => $<?php 
echo ahToolkit::variablize($this->getSingularName()) ?>, 'helper' => $helper)) 
?]
     </tbody>
   </table>
   <!--</div>-->

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_show_actions.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_show_actions.php
   2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_show_actions.php
   2010-03-25 17:03:01 UTC (rev 28789)
@@ -1,6 +1,6 @@
 <?php foreach ($this->configuration->getValue('show.actions') as $name => 
$params): ?>
 <?php if ('_edit' == $name): ?>
-  <?php echo $this->addCredentialCondition('[?php echo 
$helper->linkToEdit($'.$this->getSingularName().', '.$this->asPhp($params).') 
?]', $params) ?>
+  <?php echo $this->addCredentialCondition('[?php echo 
$helper->linkToEdit($'.ahToolkit::variablize($this->getSingularName()).', 
'.$this->asPhp($params).') ?]', $params) ?>
 
 <?php elseif ('_list' == $name): ?>
   <?php echo $this->addCredentialCondition('[?php echo 
$helper->linkToList('.$this->asPhp($params).') ?]', $params) ?>

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/editSuccess.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/editSuccess.php
     2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/editSuccess.php
     2010-03-25 17:03:01 UTC (rev 28789)
@@ -4,17 +4,17 @@
 <div id="sf_admin_container">
   [?php slot('module_header', <?php echo $this->getI18NString('edit.title') 
?>) ?]
   [?php sfContext::getInstance()->getResponse()->setTitle(<?php echo 
$this->getI18NString('edit.title') ?>) ?]
-  [?php sfContext::getInstance()->getResponse()->setTitle($<?php echo 
$this->getSingularName() ?>) ?]
+  [?php sfContext::getInstance()->getResponse()->setTitle($<?php echo 
ahToolkit::variablize($this->getSingularName()) ?>) ?]
 
   <div id="sf_admin_header">
-    [?php include_partial('<?php echo $this->getModuleName() ?>/form_header', 
array('<?php echo $this->getSingularName() ?>' => $<?php echo 
$this->getSingularName() ?>, 'form' => $form, 'configuration' => 
$configuration)) ?]
+    [?php include_partial('<?php echo $this->getModuleName() ?>/form_header', 
array('<?php echo ahToolkit::variablize($this->getSingularName()) ?>' => $<?php 
echo ahToolkit::variablize($this->getSingularName()) ?>, 'form' => $form, 
'configuration' => $configuration)) ?]
   </div>
 
   <div id="sf_admin_content">
-    [?php include_partial('<?php echo $this->getModuleName() ?>/form', 
array('<?php echo $this->getSingularName() ?>' => $<?php echo 
$this->getSingularName() ?>, 'form' => $form, 'configuration' => 
$configuration, 'helper' => $helper)) ?]
+    [?php include_partial('<?php echo $this->getModuleName() ?>/form', 
array('<?php echo ahToolkit::variablize($this->getSingularName()) ?>' => $<?php 
echo ahToolkit::variablize($this->getSingularName()) ?>, 'form' => $form, 
'configuration' => $configuration, 'helper' => $helper)) ?]
   </div>
 
   <div id="sf_admin_footer">
-    [?php include_partial('<?php echo $this->getModuleName() ?>/form_footer', 
array('<?php echo $this->getSingularName() ?>' => $<?php echo 
$this->getSingularName() ?>, 'form' => $form, 'configuration' => 
$configuration)) ?]
+    [?php include_partial('<?php echo $this->getModuleName() ?>/form_footer', 
array('<?php echo ahToolkit::variablize($this->getSingularName()) ?>' => $<?php 
echo ahToolkit::variablize($this->getSingularName()) ?>, 'form' => $form, 
'configuration' => $configuration)) ?]
   </div>
 </div>

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/indexSuccess.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/indexSuccess.php
    2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/indexSuccess.php
    2010-03-25 17:03:01 UTC (rev 28789)
@@ -8,7 +8,7 @@
   [?php include_partial('<?php echo $this->getModuleName() ?>/filters', 
array('form' => $filters, 'configuration' => $configuration)) ?]
 <?php endif; ?>
 
-[?php include_partial('<?php echo $this->getModuleName() ?>/form_header', 
array('form' => $filters, 'configuration' => $configuration)) ?]
+[?php include_partial('<?php echo $this->getModuleName() ?>/form_header', 
array('form' => <?php echo $this->configuration->hasFilterForm() ? '$filters' : 
'null' ?>, 'configuration' => $configuration)) ?]
 
 
 <?php if ($this->configuration->getValue('list.batch_actions')): ?>
@@ -23,4 +23,4 @@
   </form>
 <?php endif; ?>
 
-[?php include_partial('<?php echo $this->getModuleName() ?>/form_footer', 
array('form' => $filters, 'configuration' => $configuration)) ?]
\ No newline at end of file
+[?php include_partial('<?php echo $this->getModuleName() ?>/form_footer', 
array('form' => <?php echo $this->configuration->hasFilterForm() ? '$filters' : 
'null' ?>, 'configuration' => $configuration)) ?]
\ No newline at end of file

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/newSuccess.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/newSuccess.php
      2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/newSuccess.php
      2010-03-25 17:03:01 UTC (rev 28789)
@@ -6,14 +6,14 @@
   [?php sfContext::getInstance()->getResponse()->setTitle(<?php echo 
$this->getI18NString('new.title') ?>) ?]
 
   <div id="sf_admin_header">
-    [?php include_partial('<?php echo $this->getModuleName() ?>/form_header', 
array('<?php echo $this->getSingularName() ?>' => $<?php echo 
$this->getSingularName() ?>, 'form' => $form, 'configuration' => 
$configuration)) ?]
+    [?php include_partial('<?php echo $this->getModuleName() ?>/form_header', 
array('<?php echo ahToolkit::variablize($this->getSingularName()) ?>' => $<?php 
echo ahToolkit::variablize($this->getSingularName()) ?>, 'form' => $form, 
'configuration' => $configuration)) ?]
   </div>
 
   <div id="sf_admin_content">
-    [?php include_partial('<?php echo $this->getModuleName() ?>/form', 
array('<?php echo $this->getSingularName() ?>' => $<?php echo 
$this->getSingularName() ?>, 'form' => $form, 'configuration' => 
$configuration, 'helper' => $helper)) ?]
+    [?php include_partial('<?php echo $this->getModuleName() ?>/form', 
array('<?php echo ahToolkit::variablize($this->getSingularName()) ?>' => $<?php 
echo ahToolkit::variablize($this->getSingularName()) ?>, 'form' => $form, 
'configuration' => $configuration, 'helper' => $helper)) ?]
   </div>
 
   <div id="sf_admin_footer">
-    [?php include_partial('<?php echo $this->getModuleName() ?>/form_footer', 
array('<?php echo $this->getSingularName() ?>' => $<?php echo 
$this->getSingularName() ?>, 'form' => $form, 'configuration' => 
$configuration)) ?]
+    [?php include_partial('<?php echo $this->getModuleName() ?>/form_footer', 
array('<?php echo ahToolkit::variablize($this->getSingularName()) ?>' => $<?php 
echo ahToolkit::variablize($this->getSingularName()) ?>, 'form' => $form, 
'configuration' => $configuration)) ?]
   </div>
 </div>

Modified: 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/showSuccess.php
===================================================================
--- 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/showSuccess.php
     2010-03-25 16:58:57 UTC (rev 28788)
+++ 
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/showSuccess.php
     2010-03-25 17:03:01 UTC (rev 28789)
@@ -2,10 +2,10 @@
 [?php include_partial('<?php echo $this->getModuleName() ?>/assets') ?]
 
 [?php slot('module_header', <?php echo $this->getI18NString('show.title') ?>) 
?]
-[?php sfContext::getInstance()->getResponse()->setTitle($<?php echo 
$this->getSingularName() ?>) ?]
+[?php sfContext::getInstance()->getResponse()->setTitle($<?php echo 
ahToolkit::variablize($this->getSingularName()) ?>) ?]
 
-<h2 class="no_top_padding">[?php echo $<?php echo $this->getSingularName() ?> 
?]</h2>
+<h2 class="no_top_padding">[?php echo $<?php echo 
ahToolkit::variablize($this->getSingularName()) ?> ?]</h2>
 
-[?php include_partial('<?php echo $this->getModuleName() ?>/show', 
array('<?php echo $this->getSingularName() ?>' => $<?php echo 
$this->getSingularName() ?>, 'helper' => $helper)) ?]
+[?php include_partial('<?php echo $this->getModuleName() ?>/show', 
array('<?php echo ahToolkit::variablize($this->getSingularName()) ?>' => $<?php 
echo ahToolkit::variablize($this->getSingularName()) ?>, 'helper' => $helper)) 
?]
 
-[?php include_partial('<?php echo $this->getModuleName() ?>/show_actions', 
array('<?php echo $this->getSingularName() ?>' => $<?php echo 
$this->getSingularName() ?>, 'configuration' => $configuration, 'helper' => 
$helper)) ?]
+[?php include_partial('<?php echo $this->getModuleName() ?>/show_actions', 
array('<?php echo ahToolkit::variablize($this->getSingularName()) ?>' => $<?php 
echo ahToolkit::variablize($this->getSingularName()) ?>, 'configuration' => 
$configuration, 'helper' => $helper)) ?]

-- 
You received this message because you are subscribed to the Google Groups 
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/symfony-svn?hl=en.

Reply via email to