Author: annis
Date: 2010-04-18 21:55:24 +0200 (Sun, 18 Apr 2010)
New Revision: 29195
Modified:
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list_th_tabular.php
plugins/ahAdminGeneratorThemesPlugin/trunk/package.xml
Log:
Merge branch 'master' into HEAD
Modified:
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list_th_tabular.php
===================================================================
---
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list_th_tabular.php
2010-04-18 19:33:38 UTC (rev 29194)
+++
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list_th_tabular.php
2010-04-18 19:55:24 UTC (rev 29195)
@@ -1,7 +1,7 @@
<?php foreach ($this->configuration->getValue('list.display') as $name =>
$field): ?>
[?php slot('sf_admin.current_header') ?]
<th class="sf_admin_<?php echo strtolower($field->getType()) ?>
sf_admin_list_th_<?php echo $name ?>">
-<?php if ($field->isReal() || $field->getConfig('is_sortable', false, false)):
?>
+<?php if (($field->isReal() && $field->getConfig('is_sortable', true, false))
|| $field->getConfig('is_sortable', false, false)): ?>
[?php if ('<?php echo $name ?>' == $sort[0]): ?]
[?php echo link_to(__('<?php echo $field->getConfig('label', '', true)
?>', array(), '<?php echo $this->getI18nCatalogue() ?>'), '@<?php echo
$this->getUrlForAction('list') ?>', array('title' => __('sort '.($sort[1] ==
'asc' ? 'descending' : 'ascending'), array(), 'sf_admin'), 'query_string' =>
'sort=<?php echo $name ?>&sort_type='.($sort[1] == 'asc' ? 'desc' : 'asc'))) ?]
[?php echo image_tag('icons/arrow_'.$sort[1].'.png', array('alt_title' =>
__('sorted '.($sort[1] == 'asc' ? 'ascending' : 'descending'), array(),
'sf_admin'))) ?]
Modified: plugins/ahAdminGeneratorThemesPlugin/trunk/package.xml
===================================================================
--- plugins/ahAdminGeneratorThemesPlugin/trunk/package.xml 2010-04-18
19:33:38 UTC (rev 29194)
+++ plugins/ahAdminGeneratorThemesPlugin/trunk/package.xml 2010-04-18
19:55:24 UTC (rev 29195)
@@ -10,9 +10,9 @@
<email>[email protected]</email>
<active>yes</active>
</lead>
- <date>2010-04-15</date>
+ <date>2010-04-18</date>
<version>
- <release>0.8.7</release>
+ <release>0.8.8</release>
<api>0.8.0</api>
</version>
<stability>
@@ -129,5 +129,21 @@
- updated package.xml for version 0.8.7
</notes>
</release>
+ <release>
+ <version>
+ <release>0.8.8</release>
+ <api>0.8.0</api>
+ </version>
+ <stability>
+ <release>beta</release>
+ <api>beta</api>
+ </stability>
+ <license uri="http://www.symfony-project.com/license";>MIT
license</license>
+ <date>2010-04-18</date>
+ <license>MIT</license>
+ <notes>
+ - only in ahAdminGeneratorThemesPluginAdmin: added the
possibility to disable sorting for real columns
+ </notes>
+ </release>
</changelog>
</package>
--
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.
