Changeset 8310
- Timestamp:
- 04/04/08 20:31:13 (6 months ago)
- Files:
-
- plugins/sfAdvancedAdminGeneratorPlugin/trunk/data/generator/sfAdvancedAdmin/default/template/actions/actions.class.php (modified) (2 diffs)
- plugins/sfAdvancedAdminGeneratorPlugin/trunk/data/generator/sfAdvancedAdmin/default/template/templates/_list.php (modified) (1 diff)
- plugins/sfAdvancedAdminGeneratorPlugin/trunk/data/generator/sfAdvancedAdmin/default/template/templates/_list_td_tabular.php (modified) (1 diff)
- plugins/sfAdvancedAdminGeneratorPlugin/trunk/data/generator/sfAdvancedAdmin/default/template/templates/createSuccess.php (modified) (1 diff)
- plugins/sfAdvancedAdminGeneratorPlugin/trunk/data/generator/sfAdvancedAdmin/default/template/templates/editSuccess.php (modified) (1 diff)
- plugins/sfAdvancedAdminGeneratorPlugin/trunk/data/generator/sfAdvancedAdmin/default/template/templates/listSuccess.php (modified) (1 diff)
- plugins/sfAdvancedAdminGeneratorPlugin/trunk/lib/sfAdvancedAdminGenerator.class.php (modified) (1 diff)
- plugins/sfAdvancedAdminGeneratorPlugin/trunk/package.xml (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
plugins/sfAdvancedAdminGeneratorPlugin/trunk/data/generator/sfAdvancedAdmin/default/template/actions/actions.class.php
r8309 r8310 8 8 9 9 * @author Fabien Potencier <fabien.potencier@symfony-project.com> 10 * @version SVN: $Id: actions.class.php 3 00 2007-10-23 15:18:49Z romain $10 * @version SVN: $Id: actions.class.php 390 2007-12-18 15:59:00Z romain $ 11 11 */ 12 12 class <?php echo $this->getGeneratedModuleName() ?>Actions extends sfActions 13 13 { 14 public function preExecute() 15 { 16 $this->maps = $this->getMaps(); 17 } 18 19 public function executeAutocomplete() { 20 $table = sfInflector::camelize($this->getRequestParameter('table')); 21 $field = sfInflector::camelize($this->getRequestParameter('field')); 22 $search = $this->getRequestParameter("${table}_${field}_search"); 23 $return = ''; 24 $c = new Criteria(); 25 $c->add(constant($table.'Peer::'.strtoupper($field)), '%'.$search.'%', Criteria::LIKE); 26 foreach (call_user_func(array($table.'Peer', 'doSelect'), $c) as $item) { 27 $return .= '<li id="'.$item->getId().'">'.call_user_func(array($item, 'get'.$this->getRequestParameter('field'))).'</li>'; 28 } 29 return $this->renderText('<ul>'.$return.'</ul>'); 30 } 31 14 32 public function executeIndex() 15 33 { … … 496 514 } 497 515 } 516 517 protected function getMaps() 518 { 519 return <?php var_export($this->getParameterValue('maps'))?>; 520 } 498 521 } plugins/sfAdvancedAdminGeneratorPlugin/trunk/data/generator/sfAdvancedAdmin/default/template/templates/_list.php
r8303 r8310 11 11 [?php $i = 1; foreach ($pager->getResults() as $<?php echo $this->getSingularName() ?>): $odd = fmod(++$i, 2) ?] 12 12 <tr class="sf_admin_row_[?php echo $odd ?]"> 13 [?php include_partial('list_td_<?php echo $this->getParameterValue('list.layout', 'tabular') ?>', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?> )) ?]13 [?php include_partial('list_td_<?php echo $this->getParameterValue('list.layout', 'tabular') ?>', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'maps' => $maps)) ?] 14 14 [?php include_partial('list_td_actions', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>)) ?] 15 15 </tr> plugins/sfAdvancedAdminGeneratorPlugin/trunk/data/generator/sfAdvancedAdmin/default/template/templates/_list_td_tabular.php
r8304 r8310 7 7 <?php endif; ?> 8 8 <?php if ($column->isLink()): ?> 9 <td>[?php echo link_to(<?php echo $this->getColumnListTag($column) ?> ? <?php echo $this->getColumnListTag($column) ?> : __('-'), '<?php echo $this->getModuleName() ?>/<? echo $this->getParameterValue('list.click_action', 'edit') ?>?<?php echo $this->getPrimaryKeyUrlParams() ?>) ?]</td>9 <td>[?php echo link_to(<?php echo $this->getColumnListTag($column) ?> ? <?php echo $this->getColumnListTag($column) ?> : __('-'), '<?php echo $this->getModuleName() ?>/<?php echo $this->getParameterValue('list.click_action', 'edit') ?>?<?php echo $this->getPrimaryKeyUrlParams() ?>) ?]</td> 10 10 <?php else: ?> 11 11 <td>[?php echo <?php echo $this->getColumnListTag($column) ?> ?]</td> plugins/sfAdvancedAdminGeneratorPlugin/trunk/data/generator/sfAdvancedAdmin/default/template/templates/createSuccess.php
r8303 r8310 1 [?php use_helper('Object', 'Validation', 'ObjectAdmin', 'I18N', 'Date' ) ?]1 [?php use_helper('Object', 'Validation', 'ObjectAdmin', 'I18N', 'Date', 'AdvancedAdmin') ?] 2 2 3 3 [?php use_stylesheet('<?php echo $this->getParameterValue('css', sfConfig::get('sf_admin_web_dir').'/css/main') ?>') ?] plugins/sfAdvancedAdminGeneratorPlugin/trunk/data/generator/sfAdvancedAdmin/default/template/templates/editSuccess.php
r8303 r8310 1 [?php use_helper('Object', 'Validation', 'ObjectAdmin', 'I18N', 'Date' ) ?]1 [?php use_helper('Object', 'Validation', 'ObjectAdmin', 'I18N', 'Date', 'AdvancedAdmin') ?] 2 2 3 3 [?php use_stylesheet('<?php echo $this->getParameterValue('css', sfConfig::get('sf_admin_web_dir').'/css/main') ?>') ?] plugins/sfAdvancedAdminGeneratorPlugin/trunk/data/generator/sfAdvancedAdmin/default/template/templates/listSuccess.php
r8303 r8310 22 22 [?php echo __('no result') ?] 23 23 [?php else: ?] 24 [?php include_partial('<?php echo $this->getModuleName() ?>/list', array('pager' => $pager )) ?]24 [?php include_partial('<?php echo $this->getModuleName() ?>/list', array('pager' => $pager, 'maps' => $maps)) ?] 25 25 [?php endif; ?] 26 26 [?php include_partial('list_actions') ?] plugins/sfAdvancedAdminGeneratorPlugin/trunk/lib/sfAdvancedAdminGenerator.class.php
r8304 r8310 81 81 } 82 82 83 /** 84 * Generates a PHP call to an object helper. 85 * 86 * @param string The helper name 87 * @param string The column name 88 * @param array An array of parameters 89 * @param array An array of local parameters 90 * 91 * @return string PHP code 92 */ 93 function getPHPObjectHelper($helperName, $column, $params, $localParams = array()) 94 { 95 if (null !== ($map = $this->getParameterValue('maps.'.$column->getName()))) { 96 // Load map 97 $params['map'] = $map; 98 $helperName = 'select_map_tag'; 99 } 100 101 return parent::getPHPObjectHelper($helperName, $column, $params, $localParams); 102 } 103 83 104 public function getColumnShowTag($column, $params = array()) 84 105 { 85 106 return $this->getColumnListTag($column, $params); 107 } 108 109 public function getColumnListTag($column, $params = array()) { 110 $return = parent::getColumnListTag($column, $params); 111 if (!$column->isComponent() && !$column->isPartial()) { 112 $return = '(null !== ($val = '.$return.') && isset($maps["'.$column->getName().'"][$val])?$maps["'.$column->getName().'"][$val]:$val)'; 113 } 114 return $return; 86 115 } 87 116 plugins/sfAdvancedAdminGeneratorPlugin/trunk/package.xml
r8309 r8310 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 <package packagerversion="1. 4.11" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">2 <package packagerversion="1.6.1" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd"> 3 3 <name>sfAdvancedAdminGeneratorPlugin</name> 4 4 <channel>pear.symfony-project.com</channel> … … 11 11 <active>yes</active> 12 12 </lead> 13 <date>200 7-11-16</date>14 <time>1 2:51:52</time>13 <date>2008-03-03</date> 14 <time>16:11:09</time> 15 15 <version> 16 <release>0.1. 3</release>17 <api>0.1. 3</api>16 <release>0.1.4</release> 17 <api>0.1.4</api> 18 18 </version> 19 19 <stability> … … 25 25 <contents> 26 26 <dir name="/"> 27 <file md5sum="7094efc35253eaa82343026c9b922547" name="data/generator/sfAdvancedAdmin/default/template/actions/actions.class.php" role="data" /> 27 <file md5sum="64b5621f26b3bd52aacbe8be2898c89d" name="lib/helper/AdvancedAdminHelper.php" role="data" /> 28 <file md5sum="9c627334618a64dc9d97fdda3be61c4e" name="lib/sfAdvancedAdminGenerator.class.php" role="data" /> 29 <file md5sum="5c14c3912e8e35f7f43ea671c5ed737d" name="data/generator/sfAdvancedAdmin/default/template/actions/actions.class.php" role="data" /> 30 <file md5sum="d41d8cd98f00b204e9800998ecf8427e" name="data/generator/sfAdvancedAdmin/default/template/templates/_show_header.php" role="data" /> 31 <file md5sum="d41d8cd98f00b204e9800998ecf8427e" name="data/generator/sfAdvancedAdmin/default/template/templates/_create_footer.php" role="data" /> 32 <file md5sum="cf07bc656e18ae390e4b7f7706ee4490" name="data/generator/sfAdvancedAdmin/default/template/templates/_list_th_tabular.php" role="data" /> 33 <file md5sum="89543f9e61f721a5380a76421bcffed5" name="data/generator/sfAdvancedAdmin/default/template/templates/_list_td_tabular.php" role="data" /> 34 <file md5sum="d41d8cd98f00b204e9800998ecf8427e" name="data/generator/sfAdvancedAdmin/default/template/templates/_edit_footer.php" role="data" /> 35 <file md5sum="208f931d28219f4f9b227ac2065dcab6" name="data/generator/sfAdvancedAdmin/default/template/templates/_list_messages.php" role="data" /> 36 <file md5sum="e40ef5265dd4213fdcbfeb0735e1b8b0" name="data/generator/sfAdvancedAdmin/default/template/templates/_create_header.php" role="data" /> 37 <file md5sum="4f227c73dbeb84db2aa52696e8ead246" name="data/generator/sfAdvancedAdmin/default/template/templates/_create_form.php" role="data" /> 38 <file md5sum="ea8bb65246dd3be78024d80f2d07c897" name="data/generator/sfAdvancedAdmin/default/template/templates/_show_actions.php" role="data" /> 39 <file md5sum="d41d8cd98f00b204e9800998ecf8427e" name="data/generator/sfAdvancedAdmin/default/template/templates/_edit_header.php" role="data" /> 40 <file md5sum="cbc41f754c7d8d689241c167a4ad818e" name="data/generator/sfAdvancedAdmin/default/template/templates/_filters.php" role="data" /> 41 <file md5sum="d41d8cd98f00b204e9800998ecf8427e" name="data/generator/sfAdvancedAdmin/default/template/templates/_list_footer.php" role="data" /> 42 <file md5sum="2a6640f718e05f36827a1aa5d0040f1f" name="data/generator/sfAdvancedAdmin/default/template/templates/showSuccess.php" role="data" /> 43 <file md5sum="37f96b05d70df8f26b250b995c6a001f" name="data/generator/sfAdvancedAdmin/default/template/templates/_list_td_actions.php" role="data" /> 44 <file md5sum="599788fbcbf42755f1b9297cd7b81bdb" name="data/generator/sfAdvancedAdmin/default/template/templates/_edit_actions.php" role="data" /> 45 <file md5sum="d41d8cd98f00b204e9800998ecf8427e" name="data/generator/sfAdvancedAdmin/default/template/templates/_list_header.php" role="data" /> 46 <file md5sum="11fe4bad88bed0d864f989f8e0924a2d" name="data/generator/sfAdvancedAdmin/default/template/templates/_list.php" role="data" /> 47 <file md5sum="084ff9b1da43ab3d71c390739e0bf377" name="data/generator/sfAdvancedAdmin/default/template/templates/editSuccess.php" role="data" /> 48 <file md5sum="f94fa0edce99730123d17db97902e1c2" name="data/generator/sfAdvancedAdmin/default/template/templates/_create_messages.php" role="data" /> 49 <file md5sum="1d757049672fd1b896b486fbd725a2d4" name="data/generator/sfAdvancedAdmin/default/template/templates/_show.php" role="data" /> 50 <file md5sum="a56f41c8133291c743ea56b5d83146c2" name="data/generator/sfAdvancedAdmin/default/template/templates/_list_th_stacked.php" role="data" /> 51 <file md5sum="45d33bbbd746d4ce436c0c33c3908da5" name="data/generator/sfAdvancedAdmin/default/template/templates/_list_td_stacked.php" role="data" /> 28 52 <file md5sum="99bf4065cd55a4f6cddadce48c284a88" name="data/generator/sfAdvancedAdmin/default/template/templates/_create_actions.php" role="data" /> 29 <file md5sum="d41d8cd98f00b204e9800998ecf8427e" name="data/generator/sfAdvancedAdmin/default/template/templates/_create_footer.php" role="data" /> 30 <file md5sum="4f227c73dbeb84db2aa52696e8ead246" name="data/generator/sfAdvancedAdmin/default/template/templates/_create_form.php" role="data" /> 31 <file md5sum="e40ef5265dd4213fdcbfeb0735e1b8b0" name="data/generator/sfAdvancedAdmin/default/template/templates/_create_header.php" role="data" /> 32 <file md5sum="f94fa0edce99730123d17db97902e1c2" name="data/generator/sfAdvancedAdmin/default/template/templates/_create_messages.php" role="data" /> 33 <file md5sum="599788fbcbf42755f1b9297cd7b81bdb" name="data/generator/sfAdvancedAdmin/default/template/templates/_edit_actions.php" role="data" /> 34 <file md5sum="d41d8cd98f00b204e9800998ecf8427e" name="data/generator/sfAdvancedAdmin/default/template/templates/_edit_footer.php" role="data" /> 53 <file md5sum="3ec454af9e25c14efd747fb58bd0bae2" name="data/generator/sfAdvancedAdmin/default/template/templates/listSuccess.php" role="data" /> 54 <file md5sum="5ef5a93b694a73470dded8a483601acd" name="data/generator/sfAdvancedAdmin/default/template/templates/_list_actions.php" role="data" /> 35 55 <file md5sum="84ed842510100ba5b0ed36f711b86933" name="data/generator/sfAdvancedAdmin/default/template/templates/_edit_form.php" role="data" /> 36 <file md5sum=" d41d8cd98f00b204e9800998ecf8427e" name="data/generator/sfAdvancedAdmin/default/template/templates/_edit_header.php" role="data" />56 <file md5sum="bcf0cd289c0348c4ffe04d0a1b70574d" name="data/generator/sfAdvancedAdmin/default/template/templates/createSuccess.php" role="data" /> 37 57 <file md5sum="f94fa0edce99730123d17db97902e1c2" name="data/generator/sfAdvancedAdmin/default/template/templates/_edit_messages.php" role="data" /> 38 <file md5sum="cbc41f754c7d8d689241c167a4ad818e" name="data/generator/sfAdvancedAdmin/default/template/templates/_filters.php" role="data" />39 <file md5sum="5ef5a93b694a73470dded8a483601acd" name="data/generator/sfAdvancedAdmin/default/template/templates/_list_actions.php" role="data" />40 <file md5sum="d41d8cd98f00b204e9800998ecf8427e" name="data/generator/sfAdvancedAdmin/default/template/templates/_list_footer.php" role="data" />41 <file md5sum="d41d8cd98f00b204e9800998ecf8427e" name="data/generator/sfAdvancedAdmin/default/template/templates/_list_header.php" role="data" />42 <file md5sum="208f931d28219f4f9b227ac2065dcab6" name="data/generator/sfAdvancedAdmin/default/template/templates/_list_messages.php" role="data" />43 <file md5sum="37f96b05d70df8f26b250b995c6a001f" name="data/generator/sfAdvancedAdmin/default/template/templates/_list_td_actions.php" role="data" />44 <file md5sum="45d33bbbd746d4ce436c0c33c3908da5" name="data/generator/sfAdvancedAdmin/default/template/templates/_list_td_stacked.php" role="data" />45 <file md5sum="0abaf4ab624d80937fc5953ac227f9c1" name="data/generator/sfAdvancedAdmin/default/template/templates/_list_td_tabular.php" role="data" />46 <file md5sum="a56f41c8133291c743ea56b5d83146c2" name="data/generator/sfAdvancedAdmin/default/template/templates/_list_th_stacked.php" role="data" />47 <file md5sum="cf07bc656e18ae390e4b7f7706ee4490" name="data/generator/sfAdvancedAdmin/default/template/templates/_list_th_tabular.php" role="data" />48 <file md5sum="5fe99a831753020603c3ea924c2b246c" name="data/generator/sfAdvancedAdmin/default/template/templates/_list.php" role="data" />49 <file md5sum="ea8bb65246dd3be78024d80f2d07c897" name="data/generator/sfAdvancedAdmin/default/template/templates/_show_actions.php" role="data" />50 58 <file md5sum="d41d8cd98f00b204e9800998ecf8427e" name="data/generator/sfAdvancedAdmin/default/template/templates/_show_footer.php" role="data" /> 51 <file md5sum="d41d8cd98f00b204e9800998ecf8427e" name="data/generator/sfAdvancedAdmin/default/template/templates/_show_header.php" role="data" /> 52 <file md5sum="1d757049672fd1b896b486fbd725a2d4" name="data/generator/sfAdvancedAdmin/default/template/templates/_show.php" role="data" /> 53 <file md5sum="5b06c2d05f5e2f7db2edbde0d19ab631" name="data/generator/sfAdvancedAdmin/default/template/templates/createSuccess.php" role="data" /> 54 <file md5sum="815ea1e613f2d8ef462de8eeee34d173" name="data/generator/sfAdvancedAdmin/default/template/templates/editSuccess.php" role="data" /> 55 <file md5sum="b980e7a592fe5a096c2e1770c8c04f1e" name="data/generator/sfAdvancedAdmin/default/template/templates/listSuccess.php" role="data" /> 56 <file md5sum="2a6640f718e05f36827a1aa5d0040f1f" name="data/generator/sfAdvancedAdmin/default/template/templates/showSuccess.php" role="data" /> 57 <file md5sum="ea9bc1fa3b4205dbe291edca922dbb0e" name="lib/sfAdvancedAdminGenerator.class.php" role="data" /> 59 <file md5sum="f8f064191ae90258ba4b3005852a2bbd" name="LICENSE" role="data" /> 58 60 <file md5sum="e6f0a67248315f9d0856a510a6824294" name="README" role="data" /> 59 <file md5sum="f8f064191ae90258ba4b3005852a2bbd" name="LICENSE" role="data" />60 61 </dir> 61 62 </contents> … … 115 116 <api>beta</api> 116 117 </stability> 117 <date>200 1-10-29</date>118 <date>2007-10-29</date> 118 119 <license>MIT license</license> 119 120 <notes>romain: BugFix : Missing ShowSuccess.php file in the package</notes> … … 128 129 <api>beta</api> 129 130 </stability> 130 <date>200 1-11-16</date>131 <date>2007-11-16</date> 131 132 <license>MIT license</license> 132 133 <notes>romain: BugFix : Handle failed form validation with create 133 134 romain: Feature : Add flash notice on list action</notes> 134 135 </release> 136 <release> 137 <version> 138 <release>0.1.4</release> 139 <api>0.1.4</api> 140 </version> 141 <stability> 142 <release>beta</release> 143 <api>beta</api> 144 </stability> 145 <date>2008-03-03</date> 146 <license>MIT license</license> 147 <notes>shouze: BugFix : minor typo correction in _list_td_tabular.php 148 shouze: Feature : helpers added ! object_input_auto_complete_tag() (autocompletion for objects) and object_select_map_tag() (enum for everybody !)</notes> 149 </release> 135 150 </changelog> 136 151 </package>