Permalink
Browse files

update admin

  • Loading branch information...
1 parent 32c9895 commit db07cc45428622259ad124252ff88dc711c6a0a0 @vincentchalamon committed Oct 8, 2012
@@ -98,4 +98,13 @@ public function addPublicationColumnQuery(Doctrine_Query $query, $field, $values
break;
}
}
+
+ public function buildQuery(array $values)
+ {
+ $query = parent::buildQuery($values);
+ if ($this->getTable()->hasTemplate('SoftDelete')) {
+ $query->andWhere($query->getRootAlias().'.deleted_at IS NULL');
+ }
+ return $query;
+ }
}
@@ -59,4 +59,13 @@ public function addSearchColumnQuery(Doctrine_Query $query, $field, $values)
$query->andWhere("($where)", $params);
}
}
+
+ public function buildQuery(array $values)
+ {
+ $query = parent::buildQuery($values);
+ if ($this->getTable()->hasTemplate('SoftDelete')) {
+ $query->andWhere($query->getRootAlias().'.deleted_at IS NULL');
+ }
+ return $query;
+ }
}
@@ -98,4 +98,13 @@ public function addSearchColumnQuery(Doctrine_Query $query, $field, $values)
$query->andWhere("($where)", $params);
}
}
+
+ public function buildQuery(array $values)
+ {
+ $query = parent::buildQuery($values);
+ if ($this->getTable()->hasTemplate('SoftDelete')) {
+ $query->andWhere($query->getRootAlias().'.deleted_at IS NULL');
+ }
+ return $query;
+ }
}
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- *
- * @package symfony
- * @subpackage plugin
- * @author Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version SVN: $Id: BasesfGuardUserActions.class.php 24574 2009-11-30 12:00:04Z fabien $
- */
-class BasesfGuardUserActions extends autosfGuardUserActions
-{
-}
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * sfGuardUser module configuration.
+ *
+ * @package sfGuardPlugin
+ * @subpackage sfGuardUser
+ * @author Fabien Potencier
+ * @version SVN: $Id: sfGuardUserGeneratorConfiguration.class.php 23319 2009-10-25 12:22:23Z Kris.Wallsmith $
+ */
+class PluginSfGuardUserGeneratorConfiguration extends BaseSfGuardUserGeneratorConfiguration
+{
+ public function getMainDisplay()
+ {
+ return array("username", "password", "password_again", "email_address", "first_name", "last_name");
+ }
+
+ public function getMetasDisplay()
+ {
+ return array("is_active", "is_super_admin", "redirect_url", "groups_list", "permissions_list");
+ }
+}
@@ -8,15 +8,6 @@
* @author Fabien Potencier
* @version SVN: $Id: sfGuardUserGeneratorConfiguration.class.php 23319 2009-10-25 12:22:23Z Kris.Wallsmith $
*/
-class sfGuardUserGeneratorConfiguration extends BaseSfGuardUserGeneratorConfiguration
+class sfGuardUserGeneratorConfiguration extends PluginSfGuardUserGeneratorConfiguration
{
- public function getMainDisplay()
- {
- return array("username", "password", "password_again", "email_address", "first_name", "last_name");
- }
-
- public function getMetasDisplay()
- {
- return array("is_active", "is_super_admin", "redirect_url", "groups_list", "permissions_list");
- }
}

0 comments on commit db07cc4

Please sign in to comment.