Author: Jonathan.Wage
Date: 2010-02-11 14:16:24 +0100 (Thu, 11 Feb 2010)
New Revision: 27886
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentTable.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/config/generator.yml
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/lib/Basesympal_contentActions.class.php
Log:
[1.4][sfSympalPlugin][1.0] More fixes for pgsql
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentTable.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentTable.class.php
2010-02-11 12:10:35 UTC (rev 27885)
+++
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentTable.class.php
2010-02-11 13:16:24 UTC (rev 27886)
@@ -139,6 +139,7 @@
}
}
+ $q->orderBy('l.slug ASC, a.slug ASC');
$q->enableSympalResultCache('sympal_get_content');
return $q->fetchOne();
@@ -160,11 +161,9 @@
->leftJoin($alias.'.Assets a')
->leftJoin($alias.'.CreatedBy u')
->innerJoin($alias.'.Type t')
- ->innerJoin($alias.'.Site si')
// Don't use param to work around Doctrine pgsql bug
// with limit subquery and number of params
- ->andWhere(sprintf("si.slug = '%s'", $sympalContext->getSiteSlug()))
- ->orderBy('l.slug ASC, a.slug ASC');
+ ->innerJoin(sprintf($alias.".Site si WITH si.slug = '%s'",
$sympalContext->getSiteSlug()));
$user = sfContext::getInstance()->getUser();
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/config/generator.yml
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/config/generator.yml
2010-02-11 12:10:35 UTC (rev 27885)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/config/generator.yml
2010-02-11 13:16:24 UTC (rev 27886)
@@ -56,7 +56,6 @@
table_method: getAdminGenQuery
title: Manage Content
display: [_title, _is_published]
- sort: ['m.root_id asc, m.lft']
batch_actions:
_delete:
publish:
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/lib/Basesympal_contentActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/lib/Basesympal_contentActions.class.php
2010-02-11 12:10:35 UTC (rev 27885)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/lib/Basesympal_contentActions.class.php
2010-02-11 13:16:24 UTC (rev 27886)
@@ -8,6 +8,11 @@
return $content->$func();
}
+ protected function addSortQuery($query)
+ {
+ $query->addOrderBy('m.root_id ASC, m.lft ASC');
+ }
+
public function executeBatchPublish(sfWebRequest $request)
{
$ids = $request->getParameter('ids');
--
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.
