Merge branch 'tax'

core/lib/Base/NewsletterQuery.php

@@ -0,0 +1,443 @@
+<?php
+
+namespace Base;
+
+use \Newsletter as ChildNewsletter;
+use \NewsletterQuery as ChildNewsletterQuery;
+use \Exception;
+use \PDO;
+use Map\NewsletterTableMap;
+use Propel\Runtime\Propel;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Exception\PropelException;
+
+/**
+ * Base class that represents a query for the 'newsletter' table.
+ *
+ *
+ *
+ * @method     ChildNewsletterQuery orderById($order = Criteria::ASC) Order by the id column
+ * @method     ChildNewsletterQuery orderByEmail($order = Criteria::ASC) Order by the email column
+ * @method     ChildNewsletterQuery orderByFirstname($order = Criteria::ASC) Order by the firstname column
+ * @method     ChildNewsletterQuery orderByLastname($order = Criteria::ASC) Order by the lastname column
+ *
+ * @method     ChildNewsletterQuery groupById() Group by the id column
+ * @method     ChildNewsletterQuery groupByEmail() Group by the email column
+ * @method     ChildNewsletterQuery groupByFirstname() Group by the firstname column
+ * @method     ChildNewsletterQuery groupByLastname() Group by the lastname column
+ *
+ * @method     ChildNewsletterQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
+ * @method     ChildNewsletterQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
+ * @method     ChildNewsletterQuery innerJoin($relation) Adds a INNER JOIN clause to the query
+ *
+ * @method     ChildNewsletter findOne(ConnectionInterface $con = null) Return the first ChildNewsletter matching the query
+ * @method     ChildNewsletter findOneOrCreate(ConnectionInterface $con = null) Return the first ChildNewsletter matching the query, or a new ChildNewsletter object populated from the query conditions when no match is found
+ *
+ * @method     ChildNewsletter findOneById(int $id) Return the first ChildNewsletter filtered by the id column
+ * @method     ChildNewsletter findOneByEmail(string $email) Return the first ChildNewsletter filtered by the email column
+ * @method     ChildNewsletter findOneByFirstname(string $firstname) Return the first ChildNewsletter filtered by the firstname column
+ * @method     ChildNewsletter findOneByLastname(string $lastname) Return the first ChildNewsletter filtered by the lastname column
+ *
+ * @method     array findById(int $id) Return ChildNewsletter objects filtered by the id column
+ * @method     array findByEmail(string $email) Return ChildNewsletter objects filtered by the email column
+ * @method     array findByFirstname(string $firstname) Return ChildNewsletter objects filtered by the firstname column
+ * @method     array findByLastname(string $lastname) Return ChildNewsletter objects filtered by the lastname column
+ *
+ */
+abstract class NewsletterQuery extends ModelCriteria
+{
+
+    /**
+     * Initializes internal state of \Base\NewsletterQuery object.
+     *
+     * @param     string $dbName The database name
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
+     */
+    public function __construct($dbName = 'thelia', $modelName = '\\Newsletter', $modelAlias = null)
+    {
+        parent::__construct($dbName, $modelName, $modelAlias);
+    }
+
+    /**
+     * Returns a new ChildNewsletterQuery object.
+     *
+     * @param     string $modelAlias The alias of a model in the query
+     * @param     Criteria $criteria Optional Criteria to build the query from
+     *
+     * @return ChildNewsletterQuery
+     */
+    public static function create($modelAlias = null, $criteria = null)
+    {
+        if ($criteria instanceof \NewsletterQuery) {
+            return $criteria;
+        }
+        $query = new \NewsletterQuery();
+        if (null !== $modelAlias) {
+            $query->setModelAlias($modelAlias);
+        }
+        if ($criteria instanceof Criteria) {
+            $query->mergeWith($criteria);
+        }
+
+        return $query;
+    }
+
+    /**
+     * Find object by primary key.
+     * Propel uses the instance pool to skip the database if the object exists.
+     * Go fast if the query is untouched.
+     *
+     * <code>
+     * $obj  = $c->findPk(12, $con);
+     * </code>
+     *
+     * @param mixed $key Primary key to use for the query
+     * @param ConnectionInterface $con an optional connection object
+     *
+     * @return ChildNewsletter|array|mixed the result, formatted by the current formatter
+     */
+    public function findPk($key, $con = null)
+    {
+        if ($key === null) {
+            return null;
+        }
+        if ((null !== ($obj = NewsletterTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
+            // the object is already in the instance pool
+            return $obj;
+        }
+        if ($con === null) {
+            $con = Propel::getServiceContainer()->getReadConnection(NewsletterTableMap::DATABASE_NAME);
+        }
+        $this->basePreSelect($con);
+        if ($this->formatter || $this->modelAlias || $this->with || $this->select
+         || $this->selectColumns || $this->asColumns || $this->selectModifiers
+         || $this->map || $this->having || $this->joins) {
+            return $this->findPkComplex($key, $con);
+        } else {
+            return $this->findPkSimple($key, $con);
+        }
+    }
+
+    /**
+     * Find object by primary key using raw SQL to go fast.
+     * Bypass doSelect() and the object formatter by using generated code.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     ConnectionInterface $con A connection object
+     *
+     * @return   ChildNewsletter A model object, or null if the key is not found
+     */
+    protected function findPkSimple($key, $con)
+    {
+        $sql = 'SELECT ID, EMAIL, FIRSTNAME, LASTNAME FROM newsletter WHERE ID = :p0';
+        try {
+            $stmt = $con->prepare($sql);
+            $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
+        }
+        $obj = null;
+        if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
+            $obj = new ChildNewsletter();
+            $obj->hydrate($row);
+            NewsletterTableMap::addInstanceToPool($obj, (string) $key);
+        }
+        $stmt->closeCursor();
+
+        return $obj;
+    }
+
+    /**
+     * Find object by primary key.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     ConnectionInterface $con A connection object
+     *
+     * @return ChildNewsletter|array|mixed the result, formatted by the current formatter
+     */
+    protected function findPkComplex($key, $con)
+    {
+        // As the query uses a PK condition, no limit(1) is necessary.
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $dataFetcher = $criteria
+            ->filterByPrimaryKey($key)
+            ->doSelect($con);
+
+        return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher);
+    }
+
+    /**
+     * Find objects by primary key
+     * <code>
+     * $objs = $c->findPks(array(12, 56, 832), $con);
+     * </code>
+     * @param     array $keys Primary keys to use for the query
+     * @param     ConnectionInterface $con an optional connection object
+     *
+     * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
+     */
+    public function findPks($keys, $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getReadConnection($this->getDbName());
+        }
+        $this->basePreSelect($con);
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $dataFetcher = $criteria
+            ->filterByPrimaryKeys($keys)
+            ->doSelect($con);
+
+        return $criteria->getFormatter()->init($criteria)->format($dataFetcher);
+    }
+
+    /**
+     * Filter the query by primary key
+     *
+     * @param     mixed $key Primary key to use for the query
+     *
+     * @return ChildNewsletterQuery The current query, for fluid interface
+     */
+    public function filterByPrimaryKey($key)
+    {
+
+        return $this->addUsingAlias(NewsletterTableMap::ID, $key, Criteria::EQUAL);
+    }
+
+    /**
+     * Filter the query by a list of primary keys
+     *
+     * @param     array $keys The list of primary key to use for the query
+     *
+     * @return ChildNewsletterQuery The current query, for fluid interface
+     */
+    public function filterByPrimaryKeys($keys)
+    {
+
+        return $this->addUsingAlias(NewsletterTableMap::ID, $keys, Criteria::IN);
+    }
+
+    /**
+     * Filter the query on the id column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterById(1234); // WHERE id = 1234
+     * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
+     * $query->filterById(array('min' => 12)); // WHERE id > 12
+     * </code>
+     *
+     * @param     mixed $id The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildNewsletterQuery The current query, for fluid interface
+     */
+    public function filterById($id = null, $comparison = null)
+    {
+        if (is_array($id)) {
+            $useMinMax = false;
+            if (isset($id['min'])) {
+                $this->addUsingAlias(NewsletterTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($id['max'])) {
+                $this->addUsingAlias(NewsletterTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(NewsletterTableMap::ID, $id, $comparison);
+    }
+
+    /**
+     * Filter the query on the email column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByEmail('fooValue');   // WHERE email = 'fooValue'
+     * $query->filterByEmail('%fooValue%'); // WHERE email LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $email The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildNewsletterQuery The current query, for fluid interface
+     */
+    public function filterByEmail($email = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($email)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $email)) {
+                $email = str_replace('*', '%', $email);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(NewsletterTableMap::EMAIL, $email, $comparison);
+    }
+
+    /**
+     * Filter the query on the firstname column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByFirstname('fooValue');   // WHERE firstname = 'fooValue'
+     * $query->filterByFirstname('%fooValue%'); // WHERE firstname LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $firstname The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildNewsletterQuery The current query, for fluid interface
+     */
+    public function filterByFirstname($firstname = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($firstname)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $firstname)) {
+                $firstname = str_replace('*', '%', $firstname);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(NewsletterTableMap::FIRSTNAME, $firstname, $comparison);
+    }
+
+    /**
+     * Filter the query on the lastname column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByLastname('fooValue');   // WHERE lastname = 'fooValue'
+     * $query->filterByLastname('%fooValue%'); // WHERE lastname LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $lastname The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildNewsletterQuery The current query, for fluid interface
+     */
+    public function filterByLastname($lastname = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($lastname)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $lastname)) {
+                $lastname = str_replace('*', '%', $lastname);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(NewsletterTableMap::LASTNAME, $lastname, $comparison);
+    }
+
+    /**
+     * Exclude object from result
+     *
+     * @param   ChildNewsletter $newsletter Object to remove from the list of results
+     *
+     * @return ChildNewsletterQuery The current query, for fluid interface
+     */
+    public function prune($newsletter = null)
+    {
+        if ($newsletter) {
+            $this->addUsingAlias(NewsletterTableMap::ID, $newsletter->getId(), Criteria::NOT_EQUAL);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Deletes all rows from the newsletter table.
+     *
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).
+     */
+    public function doDeleteAll(ConnectionInterface $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(NewsletterTableMap::DATABASE_NAME);
+        }
+        $affectedRows = 0; // initialize var to track total num of affected rows
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table or we could emulating ON DELETE CASCADE, etc.
+            $con->beginTransaction();
+            $affectedRows += parent::doDeleteAll($con);
+            // Because this db requires some delete cascade/set null emulation, we have to
+            // clear the cached instance *after* the emulation has happened (since
+            // instances get re-added by the select statement contained therein).
+            NewsletterTableMap::clearInstancePool();
+            NewsletterTableMap::clearRelatedInstancePool();
+
+            $con->commit();
+        } catch (PropelException $e) {
+            $con->rollBack();
+            throw $e;
+        }
+
+        return $affectedRows;
+    }
+
+    /**
+     * Performs a DELETE on the database, given a ChildNewsletter or Criteria object OR a primary key value.
+     *
+     * @param mixed               $values Criteria or ChildNewsletter object or primary key or array of primary keys
+     *              which is used to create the DELETE statement
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     *                if supported by native driver or if emulated using Propel.
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+     public function delete(ConnectionInterface $con = null)
+     {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(NewsletterTableMap::DATABASE_NAME);
+        }
+
+        $criteria = $this;
+
+        // Set the correct dbName
+        $criteria->setDbName(NewsletterTableMap::DATABASE_NAME);
+
+        $affectedRows = 0; // initialize var to track total num of affected rows
+
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table or we could emulating ON DELETE CASCADE, etc.
+            $con->beginTransaction();
+
+
+        NewsletterTableMap::removeInstanceFromPool($criteria);
+
+            $affectedRows += ModelCriteria::delete($con);
+            NewsletterTableMap::clearRelatedInstancePool();
+            $con->commit();
+
+            return $affectedRows;
+        } catch (PropelException $e) {
+            $con->rollBack();
+            throw $e;
+        }
+    }
+
+} // NewsletterQuery

core/lib/Map/NewsletterTableMap.php

@@ -0,0 +1,425 @@
+<?php
+
+namespace Map;
+
+use \Newsletter;
+use \NewsletterQuery;
+use Propel\Runtime\Propel;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\InstancePoolTrait;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Exception\PropelException;
+use Propel\Runtime\Map\RelationMap;
+use Propel\Runtime\Map\TableMap;
+use Propel\Runtime\Map\TableMapTrait;
+
+
+/**
+ * This class defines the structure of the 'newsletter' table.
+ *
+ *
+ *
+ * This map class is used by Propel to do runtime db structure discovery.
+ * For example, the createSelectSql() method checks the type of a given column used in an
+ * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
+ * (i.e. if it's a text column type).
+ *
+ */
+class NewsletterTableMap extends TableMap
+{
+    use InstancePoolTrait;
+    use TableMapTrait;
+    /**
+     * The (dot-path) name of this class
+     */
+    const CLASS_NAME = '.Map.NewsletterTableMap';
+
+    /**
+     * The default database name for this class
+     */
+    const DATABASE_NAME = 'thelia';
+
+    /**
+     * The table name for this class
+     */
+    const TABLE_NAME = 'newsletter';
+
+    /**
+     * The related Propel class for this table
+     */
+    const OM_CLASS = '\\Newsletter';
+
+    /**
+     * A class that can be returned by this tableMap
+     */
+    const CLASS_DEFAULT = 'Newsletter';
+
+    /**
+     * The total number of columns
+     */
+    const NUM_COLUMNS = 4;
+
+    /**
+     * The number of lazy-loaded columns
+     */
+    const NUM_LAZY_LOAD_COLUMNS = 0;
+
+    /**
+     * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
+     */
+    const NUM_HYDRATE_COLUMNS = 4;
+
+    /**
+     * the column name for the ID field
+     */
+    const ID = 'newsletter.ID';
+
+    /**
+     * the column name for the EMAIL field
+     */
+    const EMAIL = 'newsletter.EMAIL';
+
+    /**
+     * the column name for the FIRSTNAME field
+     */
+    const FIRSTNAME = 'newsletter.FIRSTNAME';
+
+    /**
+     * the column name for the LASTNAME field
+     */
+    const LASTNAME = 'newsletter.LASTNAME';
+
+    /**
+     * The default string format for model objects of the related table
+     */
+    const DEFAULT_STRING_FORMAT = 'YAML';
+
+    /**
+     * holds an array of fieldnames
+     *
+     * first dimension keys are the type constants
+     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
+     */
+    protected static $fieldNames = array (
+        self::TYPE_PHPNAME       => array('Id', 'Email', 'Firstname', 'Lastname', ),
+        self::TYPE_STUDLYPHPNAME => array('id', 'email', 'firstname', 'lastname', ),
+        self::TYPE_COLNAME       => array(NewsletterTableMap::ID, NewsletterTableMap::EMAIL, NewsletterTableMap::FIRSTNAME, NewsletterTableMap::LASTNAME, ),
+        self::TYPE_RAW_COLNAME   => array('ID', 'EMAIL', 'FIRSTNAME', 'LASTNAME', ),
+        self::TYPE_FIELDNAME     => array('id', 'email', 'firstname', 'lastname', ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, )
+    );
+
+    /**
+     * holds an array of keys for quick access to the fieldnames array
+     *
+     * first dimension keys are the type constants
+     * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
+     */
+    protected static $fieldKeys = array (
+        self::TYPE_PHPNAME       => array('Id' => 0, 'Email' => 1, 'Firstname' => 2, 'Lastname' => 3, ),
+        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'email' => 1, 'firstname' => 2, 'lastname' => 3, ),
+        self::TYPE_COLNAME       => array(NewsletterTableMap::ID => 0, NewsletterTableMap::EMAIL => 1, NewsletterTableMap::FIRSTNAME => 2, NewsletterTableMap::LASTNAME => 3, ),
+        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'EMAIL' => 1, 'FIRSTNAME' => 2, 'LASTNAME' => 3, ),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'email' => 1, 'firstname' => 2, 'lastname' => 3, ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, )
+    );
+
+    /**
+     * Initialize the table attributes and columns
+     * Relations are not initialized by this method since they are lazy loaded
+     *
+     * @return void
+     * @throws PropelException
+     */
+    public function initialize()
+    {
+        // attributes
+        $this->setName('newsletter');
+        $this->setPhpName('Newsletter');
+        $this->setClassName('\\Newsletter');
+        $this->setPackage('');
+        $this->setUseIdGenerator(true);
+        // columns
+        $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
+        $this->addColumn('EMAIL', 'Email', 'VARCHAR', true, 255, null);
+        $this->addColumn('FIRSTNAME', 'Firstname', 'VARCHAR', false, 255, null);
+        $this->addColumn('LASTNAME', 'Lastname', 'VARCHAR', false, 255, null);
+    } // initialize()
+
+    /**
+     * Build the RelationMap objects for this table relationships
+     */
+    public function buildRelations()
+    {
+    } // buildRelations()
+
+    /**
+     * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
+     *
+     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+     * a multi-column primary key, a serialize()d version of the primary key will be returned.
+     *
+     * @param array  $row       resultset row.
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+     */
+    public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+        // If the PK cannot be derived from the row, return NULL.
+        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+            return null;
+        }
+
+        return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+    }
+
+    /**
+     * Retrieves the primary key from the DB resultset row
+     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+     * a multi-column primary key, an array of the primary key columns will be returned.
+     *
+     * @param array  $row       resultset row.
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+     *
+     * @return mixed The primary key of the row
+     */
+    public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+
+            return (int) $row[
+                            $indexType == TableMap::TYPE_NUM
+                            ? 0 + $offset
+                            : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
+                        ];
+    }
+
+    /**
+     * The class that the tableMap will make instances of.
+     *
+     * If $withPrefix is true, the returned path
+     * uses a dot-path notation which is translated into a path
+     * relative to a location on the PHP include_path.
+     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
+     *
+     * @param boolean $withPrefix Whether or not to return the path with the class name
+     * @return string path.to.ClassName
+     */
+    public static function getOMClass($withPrefix = true)
+    {
+        return $withPrefix ? NewsletterTableMap::CLASS_DEFAULT : NewsletterTableMap::OM_CLASS;
+    }
+
+    /**
+     * Populates an object of the default type or an object that inherit from the default.
+     *
+     * @param array  $row       row returned by DataFetcher->fetch().
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+                                 One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     * @return array (Newsletter object, last column rank)
+     */
+    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+        $key = NewsletterTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
+        if (null !== ($obj = NewsletterTableMap::getInstanceFromPool($key))) {
+            // We no longer rehydrate the object, since this can cause data loss.
+            // See http://www.propelorm.org/ticket/509
+            // $obj->hydrate($row, $offset, true); // rehydrate
+            $col = $offset + NewsletterTableMap::NUM_HYDRATE_COLUMNS;
+        } else {
+            $cls = NewsletterTableMap::OM_CLASS;
+            $obj = new $cls();
+            $col = $obj->hydrate($row, $offset, false, $indexType);
+            NewsletterTableMap::addInstanceToPool($obj, $key);
+        }
+
+        return array($obj, $col);
+    }
+
+    /**
+     * The returned array will contain objects of the default type or
+     * objects that inherit from the default.
+     *
+     * @param DataFetcherInterface $dataFetcher
+     * @return array
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function populateObjects(DataFetcherInterface $dataFetcher)
+    {
+        $results = array();
+
+        // set the class once to avoid overhead in the loop
+        $cls = static::getOMClass(false);
+        // populate the object(s)
+        while ($row = $dataFetcher->fetch()) {
+            $key = NewsletterTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
+            if (null !== ($obj = NewsletterTableMap::getInstanceFromPool($key))) {
+                // We no longer rehydrate the object, since this can cause data loss.
+                // See http://www.propelorm.org/ticket/509
+                // $obj->hydrate($row, 0, true); // rehydrate
+                $results[] = $obj;
+            } else {
+                $obj = new $cls();
+                $obj->hydrate($row);
+                $results[] = $obj;
+                NewsletterTableMap::addInstanceToPool($obj, $key);
+            } // if key exists
+        }
+
+        return $results;
+    }
+    /**
+     * Add all the columns needed to create a new object.
+     *
+     * Note: any columns that were marked with lazyLoad="true" in the
+     * XML schema will not be added to the select list and only loaded
+     * on demand.
+     *
+     * @param Criteria $criteria object containing the columns to add.
+     * @param string   $alias    optional table alias
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function addSelectColumns(Criteria $criteria, $alias = null)
+    {
+        if (null === $alias) {
+            $criteria->addSelectColumn(NewsletterTableMap::ID);
+            $criteria->addSelectColumn(NewsletterTableMap::EMAIL);
+            $criteria->addSelectColumn(NewsletterTableMap::FIRSTNAME);
+            $criteria->addSelectColumn(NewsletterTableMap::LASTNAME);
+        } else {
+            $criteria->addSelectColumn($alias . '.ID');
+            $criteria->addSelectColumn($alias . '.EMAIL');
+            $criteria->addSelectColumn($alias . '.FIRSTNAME');
+            $criteria->addSelectColumn($alias . '.LASTNAME');
+        }
+    }
+
+    /**
+     * Returns the TableMap related to this object.
+     * This method is not needed for general use but a specific application could have a need.
+     * @return TableMap
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function getTableMap()
+    {
+        return Propel::getServiceContainer()->getDatabaseMap(NewsletterTableMap::DATABASE_NAME)->getTable(NewsletterTableMap::TABLE_NAME);
+    }
+
+    /**
+     * Add a TableMap instance to the database for this tableMap class.
+     */
+    public static function buildTableMap()
+    {
+      $dbMap = Propel::getServiceContainer()->getDatabaseMap(NewsletterTableMap::DATABASE_NAME);
+      if (!$dbMap->hasTable(NewsletterTableMap::TABLE_NAME)) {
+        $dbMap->addTableObject(new NewsletterTableMap());
+      }
+    }
+
+    /**
+     * Performs a DELETE on the database, given a Newsletter or Criteria object OR a primary key value.
+     *
+     * @param mixed               $values Criteria or Newsletter object or primary key or array of primary keys
+     *              which is used to create the DELETE statement
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     *                if supported by native driver or if emulated using Propel.
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+     public static function doDelete($values, ConnectionInterface $con = null)
+     {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(NewsletterTableMap::DATABASE_NAME);
+        }
+
+        if ($values instanceof Criteria) {
+            // rename for clarity
+            $criteria = $values;
+        } elseif ($values instanceof \Newsletter) { // it's a model object
+            // create criteria based on pk values
+            $criteria = $values->buildPkeyCriteria();
+        } else { // it's a primary key, or an array of pks
+            $criteria = new Criteria(NewsletterTableMap::DATABASE_NAME);
+            $criteria->add(NewsletterTableMap::ID, (array) $values, Criteria::IN);
+        }
+
+        $query = NewsletterQuery::create()->mergeWith($criteria);
+
+        if ($values instanceof Criteria) { NewsletterTableMap::clearInstancePool();
+        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
+            foreach ((array) $values as $singleval) { NewsletterTableMap::removeInstanceFromPool($singleval);
+            }
+        }
+
+        return $query->delete($con);
+    }
+
+    /**
+     * Deletes all rows from the newsletter table.
+     *
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).
+     */
+    public static function doDeleteAll(ConnectionInterface $con = null)
+    {
+        return NewsletterQuery::create()->doDeleteAll($con);
+    }
+
+    /**
+     * Performs an INSERT on the database, given a Newsletter or Criteria object.
+     *
+     * @param mixed               $criteria Criteria or Newsletter object containing data that is used to create the INSERT statement.
+     * @param ConnectionInterface $con the ConnectionInterface connection to use
+     * @return mixed           The new primary key.
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function doInsert($criteria, ConnectionInterface $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(NewsletterTableMap::DATABASE_NAME);
+        }
+
+        if ($criteria instanceof Criteria) {
+            $criteria = clone $criteria; // rename for clarity
+        } else {
+            $criteria = $criteria->buildCriteria(); // build Criteria from Newsletter object
+        }
+
+        if ($criteria->containsKey(NewsletterTableMap::ID) && $criteria->keyContainsValue(NewsletterTableMap::ID) ) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key ('.NewsletterTableMap::ID.')');
+        }
+
+
+        // Set the correct dbName
+        $query = NewsletterQuery::create()->mergeWith($criteria);
+
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table (I guess, conceivably)
+            $con->beginTransaction();
+            $pk = $query->doInsert($con);
+            $con->commit();
+        } catch (PropelException $e) {
+            $con->rollBack();
+            throw $e;
+        }
+
+        return $pk;
+    }
+
+} // NewsletterTableMap
+// This is the static code needed to register the TableMap for this table with the main Propel class.
+//
+NewsletterTableMap::buildTableMap();

core/lib/Newsletter.php

@@ -0,0 +1,8 @@
+<?php
+
+use Base\Newsletter as BaseNewsletter;
+
+class Newsletter extends BaseNewsletter
+{
+
+}

core/lib/NewsletterQuery.php

@@ -0,0 +1,19 @@
+<?php
+
+use Base\NewsletterQuery as BaseNewsletterQuery;
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'newsletter' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class NewsletterQuery extends BaseNewsletterQuery
+{
+
+} // NewsletterQuery

core/lib/Thelia/Action/Profile.php

@@ -27,8 +27,15 @@ use Propel\Runtime\ActiveQuery\Criteria;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Thelia\Core\Event\Profile\ProfileEvent;
 use Thelia\Core\Event\TheliaEvents;
+use Thelia\Core\Security\AccessManager;
+use Thelia\Model\ModuleQuery;
 use Thelia\Model\Profile as ProfileModel;
+use Thelia\Model\ProfileModule;
+use Thelia\Model\ProfileModuleQuery;
 use Thelia\Model\ProfileQuery;
+use Thelia\Model\ProfileResource;
+use Thelia\Model\ProfileResourceQuery;
+use Thelia\Model\ResourceQuery;
 
 class Profile extends BaseAction implements EventSubscriberInterface
 {
@@ -76,6 +83,54 @@ class Profile extends BaseAction implements EventSubscriberInterface
         }
     }
 
+    /**
+     * @param ProfileEvent $event
+     */
+    public function updateResourceAccess(ProfileEvent $event)
+    {
+        if (null !== $profile = ProfileQuery::create()->findPk($event->getId())) {
+            ProfileResourceQuery::create()->filterByProfileId($event->getId())->delete();
+            foreach($event->getResourceAccess() as $resourceCode => $accesses) {
+                $manager = new AccessManager(0);
+                $manager->build($accesses);
+
+                $profileResource = new ProfileResource();
+                $profileResource->setProfileId($event->getId())
+                    ->setResource(ResourceQuery::create()->findOneByCode($resourceCode))
+                    ->setAccess( $manager->getAccessValue() );
+
+                $profileResource->save();
+
+            }
+
+            $event->setProfile($profile);
+        }
+    }
+
+    /**
+     * @param ProfileEvent $event
+     */
+    public function updateModuleAccess(ProfileEvent $event)
+    {
+        if (null !== $profile = ProfileQuery::create()->findPk($event->getId())) {
+            ProfileModuleQuery::create()->filterByProfileId($event->getId())->delete();
+            foreach($event->getModuleAccess() as $moduleCode => $accesses) {
+                $manager = new AccessManager(0);
+                $manager->build($accesses);
+
+                $profileModule = new ProfileModule();
+                $profileModule->setProfileId($event->getId())
+                    ->setModule(ModuleQuery::create()->findOneByCode($moduleCode))
+                    ->setAccess( $manager->getAccessValue() );
+
+                $profileModule->save();
+
+            }
+
+            $event->setProfile($profile);
+        }
+    }
+
     /**
      * @param ProfileEvent $event
      */
@@ -97,9 +152,11 @@ class Profile extends BaseAction implements EventSubscriberInterface
     public static function getSubscribedEvents()
     {
         return array(
-            TheliaEvents::PROFILE_CREATE            => array("create", 128),
-            TheliaEvents::PROFILE_UPDATE            => array("update", 128),
-            TheliaEvents::PROFILE_DELETE            => array("delete", 128),
+            TheliaEvents::PROFILE_CREATE                        => array("create", 128),
+            TheliaEvents::PROFILE_UPDATE                        => array("update", 128),
+            TheliaEvents::PROFILE_DELETE                        => array("delete", 128),
+            TheliaEvents::PROFILE_RESOURCE_ACCESS_UPDATE        => array("updateResourceAccess", 128),
+            TheliaEvents::PROFILE_MODULE_ACCESS_UPDATE          => array("updateModuleAccess", 128),
         );
     }
 }

core/lib/Thelia/Config/Resources/config.xml

@@ -130,6 +130,8 @@
 
         <form name="thelia.admin.profile.add" class="Thelia\Form\ProfileCreationForm"/>
         <form name="thelia.admin.profile.modification" class="Thelia\Form\ProfileModificationForm"/>
+        <form name="thelia.admin.profile.resource-access.modification" class="Thelia\Form\ProfileUpdateResourceAccessForm"/>
+        <form name="thelia.admin.profile.module-access.modification" class="Thelia\Form\ProfileUpdateModuleAccessForm"/>
 
         <form name="thelia.admin.template.creation" class="Thelia\Form\TemplateCreationForm"/>
         <form name="thelia.admin.template.modification" class="Thelia\Form\TemplateModificationForm"/>

core/lib/Thelia/Config/Resources/routing/admin.xml

@@ -777,6 +777,14 @@
         <default key="_controller">Thelia\Controller\Admin\ProfileController::processUpdateAction</default>
     </route>
 
+    <route id="admin.configuration.profiles.saveResourceAccess" path="/admin/configuration/profiles/saveResourceAccess">
+        <default key="_controller">Thelia\Controller\Admin\ProfileController::processUpdateResourceAccess</default>
+    </route>
+
+    <route id="admin.configuration.profiles.saveModuleAccess" path="/admin/configuration/profiles/saveModuleAccess">
+        <default key="_controller">Thelia\Controller\Admin\ProfileController::processUpdateModuleAccess</default>
+    </route>
+
     <route id="admin.configuration.profiles.delete" path="/admin/configuration/profiles/delete">
         <default key="_controller">Thelia\Controller\Admin\ProfileController::deleteAction</default>
     </route>

core/lib/Thelia/Controller/Admin/ProfileController.php

@@ -23,12 +23,15 @@
 
 namespace Thelia\Controller\Admin;
 
+use Thelia\Core\Security\AccessManager;
 use Thelia\Core\Security\Resource\AdminResources;
 use Thelia\Core\Event\Profile\ProfileEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Form\ProfileCreationForm;
 use Thelia\Form\ProfileModificationForm;
 use Thelia\Form\ProfileProfileListUpdateForm;
+use Thelia\Form\ProfileUpdateModuleAccessForm;
+use Thelia\Form\ProfileUpdateResourceAccessForm;
 use Thelia\Model\ProfileQuery;
 
 class ProfileController extends AbstractCrudController
@@ -116,6 +119,26 @@ class ProfileController extends AbstractCrudController
         return new ProfileModificationForm($this->getRequest(), "form", $data);
     }
 
+    protected function hydrateResourceUpdateForm($object)
+    {
+        $data = array(
+            'id'           => $object->getId(),
+        );
+
+        // Setup the object form
+        return new ProfileUpdateResourceAccessForm($this->getRequest(), "form", $data);
+    }
+
+    protected function hydrateModuleUpdateForm($object)
+    {
+        $data = array(
+            'id'           => $object->getId(),
+        );
+
+        // Setup the object form
+        return new ProfileUpdateModuleAccessForm($this->getRequest(), "form", $data);
+    }
+
     protected function getObjectFromEvent($event)
     {
         return $event->hasProfile() ? $event->getProfile() : null;
@@ -223,4 +246,186 @@ class ProfileController extends AbstractCrudController
 
         return $requirements;
     }
+
+    public function updateAction()
+    {
+        if (null !== $response = $this->checkAuth($this->resourceCode, AccessManager::UPDATE)) return $response;
+
+        $object = $this->getExistingObject();
+
+        if ($object != null) {
+
+            // Hydrate the form and pass it to the parser
+            $resourceAccessForm = $this->hydrateResourceUpdateForm($object);
+            $moduleAccessForm = $this->hydrateModuleUpdateForm($object);
+
+            // Pass it to the parser
+            $this->getParserContext()->addForm($resourceAccessForm);
+            $this->getParserContext()->addForm($moduleAccessForm);
+        }
+
+        return parent::updateAction();
+    }
+
+    protected function getUpdateResourceAccessEvent($formData)
+    {
+        $event = new ProfileEvent();
+
+        $event->setId($formData['id']);
+        $event->setResourceAccess($this->getResourceAccess($formData));
+
+        return $event;
+    }
+
+    protected function getUpdateModuleAccessEvent($formData)
+    {
+        $event = new ProfileEvent();
+
+        $event->setId($formData['id']);
+        $event->setModuleAccess($this->getModuleAccess($formData));
+
+        return $event;
+    }
+
+    protected function getResourceAccess($formData)
+    {
+        $requirements = array();
+        foreach($formData as $data => $value) {
+            if(!strstr($data, ':')) {
+                continue;
+            }
+
+            $explosion = explode(':', $data);
+
+            $prefix = array_shift ( $explosion );
+
+            if($prefix != ProfileUpdateResourceAccessForm::RESOURCE_ACCESS_FIELD_PREFIX) {
+                continue;
+            }
+
+            $requirements[implode('.', $explosion)] = $value;
+        }
+
+        return $requirements;
+    }
+
+    protected function getModuleAccess($formData)
+    {
+        $requirements = array();
+        foreach($formData as $data => $value) {
+            if(!strstr($data, ':')) {
+                continue;
+            }
+
+            $explosion = explode(':', $data);
+
+            $prefix = array_shift ( $explosion );
+
+            if($prefix != ProfileUpdateModuleAccessForm::MODULE_ACCESS_FIELD_PREFIX) {
+                continue;
+            }
+
+            $requirements[implode('.', $explosion)] = $value;
+        }
+
+        return $requirements;
+    }
+
+    public function processUpdateResourceAccess()
+    {
+        // Check current user authorization
+        if (null !== $response = $this->checkAuth($this->resourceCode, AccessManager::UPDATE)) return $response;
+
+        $error_msg = false;
+
+        // Create the form from the request
+        $changeForm = new ProfileUpdateResourceAccessForm($this->getRequest());
+
+        try {
+            // Check the form against constraints violations
+            $form = $this->validateForm($changeForm, "POST");
+
+            // Get the form field values
+            $data = $form->getData();
+
+            $changeEvent = $this->getUpdateResourceAccessEvent($data);
+
+            $this->dispatch(TheliaEvents::PROFILE_RESOURCE_ACCESS_UPDATE, $changeEvent);
+
+            if (! $this->eventContainsObject($changeEvent))
+                throw new \LogicException(
+                    $this->getTranslator()->trans("No %obj was updated.", array('%obj', $this->objectName)));
+
+            // Log object modification
+            if (null !== $changedObject = $this->getObjectFromEvent($changeEvent)) {
+                $this->adminLogAppend(sprintf("%s %s (ID %s) modified", ucfirst($this->objectName), $this->getObjectLabel($changedObject), $this->getObjectId($changedObject)));
+            }
+
+            if ($response == null) {
+                $this->redirectToEditionTemplate($this->getRequest(), isset($data['country_list'][0]) ? $data['country_list'][0] : null);
+            } else {
+                return $response;
+            }
+        } catch (FormValidationException $ex) {
+            // Form cannot be validated
+            $error_msg = $this->createStandardFormValidationErrorMessage($ex);
+        } catch (\Exception $ex) {
+            // Any other error
+            $error_msg = $ex->getMessage();
+        }
+
+        $this->setupFormErrorContext($this->getTranslator()->trans("%obj modification", array('%obj' => 'taxrule')), $error_msg, $changeForm, $ex);
+
+        // At this point, the form has errors, and should be redisplayed.
+        return $this->renderEditionTemplate();
+    }
+
+    public function processUpdateModuleAccess()
+    {
+        // Check current user authorization
+        if (null !== $response = $this->checkAuth($this->resourceCode, AccessManager::UPDATE)) return $response;
+
+        $error_msg = false;
+
+        // Create the form from the request
+        $changeForm = new ProfileUpdateModuleAccessForm($this->getRequest());
+
+        try {
+            // Check the form against constraints violations
+            $form = $this->validateForm($changeForm, "POST");
+
+            // Get the form field values
+            $data = $form->getData();
+
+            $changeEvent = $this->getUpdateModuleAccessEvent($data);
+
+            $this->dispatch(TheliaEvents::PROFILE_MODULE_ACCESS_UPDATE, $changeEvent);
+
+            if (! $this->eventContainsObject($changeEvent))
+                throw new \LogicException(
+                    $this->getTranslator()->trans("No %obj was updated.", array('%obj', $this->objectName)));
+
+            // Log object modification
+            if (null !== $changedObject = $this->getObjectFromEvent($changeEvent)) {
+                $this->adminLogAppend(sprintf("%s %s (ID %s) modified", ucfirst($this->objectName), $this->getObjectLabel($changedObject), $this->getObjectId($changedObject)));
+            }
+
+            if ($response == null) {
+                $this->redirectToEditionTemplate($this->getRequest(), isset($data['country_list'][0]) ? $data['country_list'][0] : null);
+            } else {
+                return $response;
+            }
+        } catch (FormValidationException $ex) {
+            // Form cannot be validated
+            $error_msg = $this->createStandardFormValidationErrorMessage($ex);
+        } catch (\Exception $ex) {
+            // Any other error
+            $error_msg = $ex->getMessage();
+        }
+
+        $this->setupFormErrorContext($this->getTranslator()->trans("%obj modification", array('%obj' => 'taxrule')), $error_msg, $changeForm, $ex);
+
+        // At this point, the form has errors, and should be redisplayed.
+        return $this->renderEditionTemplate();
+    }
 }

core/lib/Thelia/Core/Event/Profile/ProfileEvent.php

@@ -36,6 +36,8 @@ class ProfileEvent extends ActionEvent
     protected $chapo = null;
     protected $description = null;
     protected $postscriptum = null;
+    protected $resourceAccess = null;
+    protected $moduleAccess = null;
 
     public function __construct(Profile $profile = null)
     {
@@ -128,4 +130,24 @@ class ProfileEvent extends ActionEvent
     {
         return $this->title;
     }
+
+    public function setResourceAccess($resourceAccess)
+    {
+        $this->resourceAccess = $resourceAccess;
+    }
+
+    public function getResourceAccess()
+    {
+        return $this->resourceAccess;
+    }
+
+    public function setModuleAccess($moduleAccess)
+    {
+        $this->moduleAccess = $moduleAccess;
+    }
+
+    public function getModuleAccess()
+    {
+        return $this->moduleAccess;
+    }
 }

core/lib/Thelia/Core/Event/TheliaEvents.php

@@ -549,9 +549,11 @@ final class TheliaEvents
 
     // -- Profile management ---------------------------------------------
 
-    const PROFILE_CREATE          = "action.createProfile";
-    const PROFILE_UPDATE          = "action.updateProfile";
-    const PROFILE_DELETE          = "action.deleteProfile";
+    const PROFILE_CREATE                    = "action.createProfile";
+    const PROFILE_UPDATE                    = "action.updateProfile";
+    const PROFILE_DELETE                    = "action.deleteProfile";
+    const PROFILE_RESOURCE_ACCESS_UPDATE    = "action.updateProfileResourceAccess";
+    const PROFILE_MODULE_ACCESS_UPDATE      = "action.updateProfileModuleAccess";
 
     // -- Tax Rules management ---------------------------------------------
 

core/lib/Thelia/Core/Security/AccessManager.php

@@ -49,7 +49,7 @@ class AccessManager
         self::DELETE    =>  false,
     );
 
-    protected $accessPows = array(
+    static protected $accessPows = array(
         self::VIEW      =>  3,
         self::CREATE    =>  2,
         self::UPDATE    =>  1,
@@ -62,15 +62,7 @@ class AccessManager
     {
         $this->accessValue = $accessValue;
 
-        foreach($this->accessPows as $type => $value) {
-            $pow = pow(2, $value);
-            if($accessValue >= $pow) {
-                $accessValue -= $pow;
-                $this->accessGranted[$type] = true;
-            } else {
-                $this->accessGranted[$type] = false;
-            }
-        }
+        $this->fillGrantedAccess();
     }
 
     public function can($type)
@@ -82,4 +74,41 @@ class AccessManager
         return $this->accessGranted[$type];
 
     }
+
+    static public function getMaxAccessValue()
+    {
+        return pow(2, current(array_slice( self::$accessPows, -1, 1, true ))) - 1;
+    }
+
+    public function build($accesses)
+    {
+        $this->accessValue = 0;
+        foreach($accesses as $access) {
+            if(array_key_exists($access, self::$accessPows)) {
+                $this->accessValue += pow(2, self::$accessPows[$access]);
+            }
+        }
+
+        $this->fillGrantedAccess();
+    }
+
+    protected function fillGrantedAccess()
+    {
+        $accessValue = $this->accessValue;
+        foreach(self::$accessPows as $type => $value) {
+            $pow = pow(2, $value);
+            if($accessValue >= $pow) {
+                $accessValue -= $pow;
+                $this->accessGranted[$type] = true;
+            } else {
+                $this->accessGranted[$type] = false;
+            }
+        }
+    }
+
+
+    public function getAccessValue()
+    {
+        return $this->accessValue;
+    }
 }

core/lib/Thelia/Core/Template/Loop/Module.php

@@ -24,6 +24,7 @@
 namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
+use Thelia\Core\Security\AccessManager;
 use Thelia\Core\Template\Element\BaseI18nLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
@@ -56,6 +57,13 @@ class Module extends BaseI18nLoop
     {
         return new ArgumentCollection(
             Argument::createIntListTypeArgument('id'),
+            Argument::createIntTypeArgument('profile'),
+            new Argument(
+                'code',
+                new Type\TypeCollection(
+                    new Type\AlphaNumStringListType()
+                )
+            ),
             new Argument(
                 'module_type',
                 new Type\TypeCollection(
@@ -89,6 +97,20 @@ class Module extends BaseI18nLoop
             $search->filterById($id, Criteria::IN);
         }
 
+        $profile = $this->getProfile();
+
+        if (null !== $profile) {
+            $search->leftJoinProfileModule('profile_module')
+                ->addJoinCondition('profile_module', 'profile_module.PROFILE_ID=?', $profile, null, \PDO::PARAM_INT)
+                ->withColumn('profile_module.access', 'access');
+        }
+
+        $code = $this->getCode();
+
+        if(null !== $code) {
+            $search->filterByCode($code, Criteria::IN);
+        }
+
         $moduleType = $this->getModule_type();
 
         if (null !== $moduleType) {
@@ -129,6 +151,16 @@ class Module extends BaseI18nLoop
                 ->set("CLASS", $module->getFullNamespace())
                 ->set("POSITION", $module->getPosition());
 
+            if (null !== $profile) {
+                $accessValue = $module->getVirtualColumn('access');
+                $manager = new AccessManager($accessValue);
+
+                $loopResultRow->set("VIEWABLE", $manager->can(AccessManager::VIEW)? 1 : 0)
+                    ->set("CREATABLE", $manager->can(AccessManager::CREATE) ? 1 : 0)
+                    ->set("UPDATABLE", $manager->can(AccessManager::UPDATE)? 1 : 0)
+                    ->set("DELETABLE", $manager->can(AccessManager::DELETE)? 1 : 0);
+            }
+
             $loopResult->addRow($loopResultRow);
         }
 

core/lib/Thelia/Core/Template/Loop/Resource.php

@@ -55,7 +55,13 @@ class Resource extends BaseI18nLoop
     protected function getArgDefinitions()
     {
         return new ArgumentCollection(
-            Argument::createIntTypeArgument('profile')
+            Argument::createIntTypeArgument('profile'),
+            new Argument(
+                'code',
+                new Type\TypeCollection(
+                    new Type\AlphaNumStringListType()
+                )
+            )
         );
     }
 
@@ -75,8 +81,14 @@ class Resource extends BaseI18nLoop
 
         if (null !== $profile) {
             $search->leftJoinProfileResource('profile_resource')
+                ->addJoinCondition('profile_resource', 'profile_resource.PROFILE_ID=?', $profile, null, \PDO::PARAM_INT)
                 ->withColumn('profile_resource.access', 'access');
-            //$search->filterById($id, Criteria::IN);
+        }
+
+        $code = $this->getCode();
+
+        if(null !== $code) {
+            $search->filterByCode($code, Criteria::IN);
         }
 
         $search->orderById(Criteria::ASC);
@@ -101,10 +113,11 @@ class Resource extends BaseI18nLoop
             if (null !== $profile) {
                 $accessValue = $resource->getVirtualColumn('access');
                 $manager = new AccessManager($accessValue);
-                $loopResultRow->set("VIEWABLE", $manager->can(AccessManager::VIEW))
-                    ->set("CREATABLE", $manager->can(AccessManager::CREATE))
-                    ->set("UPDATABLE", $manager->can(AccessManager::UPDATE))
-                    ->set("DELETABLE", $manager->can(AccessManager::DELETE));
+
+                $loopResultRow->set("VIEWABLE", $manager->can(AccessManager::VIEW)? 1 : 0)
+                    ->set("CREATABLE", $manager->can(AccessManager::CREATE) ? 1 : 0)
+                    ->set("UPDATABLE", $manager->can(AccessManager::UPDATE)? 1 : 0)
+                    ->set("DELETABLE", $manager->can(AccessManager::DELETE)? 1 : 0);
             }
 
             $loopResult->addRow($loopResultRow);

core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php

@@ -255,6 +255,8 @@ $this->assignFieldValues($template, $formFieldView->vars["full_name"], $fieldVar
             self::$taggedFieldsStack[self::$taggedFieldsStackPosition]['view']->setRendered();
 
             $repeat = true;
+        } else {
+            $content = null;
         }
 
         if (! $repeat) {

core/lib/Thelia/Form/ProfileUpdateModuleAccessForm.php

@@ -0,0 +1,99 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+namespace Thelia\Form;
+
+use Symfony\Component\Validator\Constraints;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Validator\ExecutionContextInterface;
+use Thelia\Core\Security\AccessManager;
+use Thelia\Core\Translation\Translator;
+use Thelia\Model\ProfileQuery;
+use Thelia\Model\ModuleQuery;
+
+/**
+ * Class ProfileUpdateModuleAccessForm
+ * @package Thelia\Form
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ */
+class ProfileUpdateModuleAccessForm extends BaseForm
+{
+    const MODULE_ACCESS_FIELD_PREFIX = "module";
+
+    protected function buildForm($change_mode = false)
+    {
+        $this->formBuilder
+            ->add("id", "hidden", array(
+                "required" => true,
+                "constraints" => array(
+                    new Constraints\NotBlank(),
+                    new Constraints\Callback(
+                        array(
+                            "methods" => array(
+                                array($this, "verifyProfileId"),
+                            ),
+                        )
+                    ),
+                )
+            ))
+        ;
+
+        foreach(ModuleQuery::create()->find() as $module) {
+            $this->formBuilder->add(
+                self::MODULE_ACCESS_FIELD_PREFIX . ':' . str_replace(".", ":", $module->getCode()),
+                "choice",
+                array(
+                    "choices" => array(
+                        AccessManager::VIEW => AccessManager::VIEW,
+                        AccessManager::CREATE => AccessManager::CREATE,
+                        AccessManager::UPDATE => AccessManager::UPDATE,
+                        AccessManager::DELETE => AccessManager::DELETE,
+                    ),
+                    "attr" => array(
+                        "tag" => "modules",
+                        "module_code" => $module->getCode(),
+                        "module_title" => $module->getTitle(),
+                    ),
+                    "multiple" => true,
+                    "constraints" => array(
+
+                    )
+                )
+            );
+        }
+    }
+
+    public function getName()
+    {
+        return "thelia_profile_module_access_modification";
+    }
+
+    public function verifyProfileId($value, ExecutionContextInterface $context)
+    {
+        $profile = ProfileQuery::create()
+            ->findPk($value);
+
+        if (null === $profile) {
+            $context->addViolation("Profile ID not found");
+        }
+    }
+}

core/lib/Thelia/Form/ProfileUpdateResourceAccessForm.php

@@ -0,0 +1,99 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+namespace Thelia\Form;
+
+use Symfony\Component\Validator\Constraints;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Validator\ExecutionContextInterface;
+use Thelia\Core\Security\AccessManager;
+use Thelia\Core\Translation\Translator;
+use Thelia\Model\ProfileQuery;
+use Thelia\Model\ResourceQuery;
+
+/**
+ * Class ProfileUpdateResourceAccessForm
+ * @package Thelia\Form
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ */
+class ProfileUpdateResourceAccessForm extends BaseForm
+{
+    const RESOURCE_ACCESS_FIELD_PREFIX = "resource";
+
+    protected function buildForm($change_mode = false)
+    {
+        $this->formBuilder
+            ->add("id", "hidden", array(
+                "required" => true,
+                "constraints" => array(
+                    new Constraints\NotBlank(),
+                    new Constraints\Callback(
+                        array(
+                            "methods" => array(
+                                array($this, "verifyProfileId"),
+                            ),
+                        )
+                    ),
+                )
+            ))
+        ;
+
+        foreach(ResourceQuery::create()->find() as $resource) {
+            $this->formBuilder->add(
+                self::RESOURCE_ACCESS_FIELD_PREFIX . ':' . str_replace(".", ":", $resource->getCode()),
+                "choice",
+                array(
+                    "choices" => array(
+                        AccessManager::VIEW => AccessManager::VIEW,
+                        AccessManager::CREATE => AccessManager::CREATE,
+                        AccessManager::UPDATE => AccessManager::UPDATE,
+                        AccessManager::DELETE => AccessManager::DELETE,
+                    ),
+                    "attr" => array(
+                        "tag" => "resources",
+                        "resource_code" => $resource->getCode(),
+                        "resource_title" => $resource->getTitle(),
+                    ),
+                    "multiple" => true,
+                    "constraints" => array(
+
+                    )
+                )
+            );
+        }
+    }
+
+    public function getName()
+    {
+        return "thelia_profile_resource_access_modification";
+    }
+
+    public function verifyProfileId($value, ExecutionContextInterface $context)
+    {
+        $profile = ProfileQuery::create()
+            ->findPk($value);
+
+        if (null === $profile) {
+            $context->addViolation("Profile ID not found");
+        }
+    }
+}

core/lib/Thelia/Model/Base/Module.php

@@ -2733,7 +2733,10 @@ abstract class Module implements ActiveRecordInterface
         $profileModulesToDelete = $this->getProfileModules(new Criteria(), $con)->diff($profileModules);
 
 
-        $this->profileModulesScheduledForDeletion = $profileModulesToDelete;
+        //since at least one column in the foreign key is at the same time a PK
+        //we can not just set a PK to NULL in the lines below. We have to store
+        //a backup of all values, so we are able to manipulate these items based on the onDelete value later.
+        $this->profileModulesScheduledForDeletion = clone $profileModulesToDelete;
 
         foreach ($profileModulesToDelete as $profileModuleRemoved) {
             $profileModuleRemoved->setModule(null);
@@ -2826,7 +2829,7 @@ abstract class Module implements ActiveRecordInterface
                 $this->profileModulesScheduledForDeletion = clone $this->collProfileModules;
                 $this->profileModulesScheduledForDeletion->clear();
             }
-            $this->profileModulesScheduledForDeletion[]= $profileModule;
+            $this->profileModulesScheduledForDeletion[]= clone $profileModule;
             $profileModule->setModule(null);
         }
 

core/lib/Thelia/Model/Base/ModuleQuery.php

@@ -823,7 +823,7 @@ abstract class ModuleQuery extends ModelCriteria
      *
      * @return ChildModuleQuery The current query, for fluid interface
      */
-    public function joinProfileModule($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    public function joinProfileModule($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
         $tableMap = $this->getTableMap();
         $relationMap = $tableMap->getRelation('ProfileModule');
@@ -858,7 +858,7 @@ abstract class ModuleQuery extends ModelCriteria
      *
      * @return   \Thelia\Model\ProfileModuleQuery A secondary query class using the current class as primary query
      */
-    public function useProfileModuleQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    public function useProfileModuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
         return $this
             ->joinProfileModule($relationAlias, $joinType)

core/lib/Thelia/Model/Base/Profile.php

@@ -1944,7 +1944,10 @@ abstract class Profile implements ActiveRecordInterface
         $profileModulesToDelete = $this->getProfileModules(new Criteria(), $con)->diff($profileModules);
 
 
-        $this->profileModulesScheduledForDeletion = $profileModulesToDelete;
+        //since at least one column in the foreign key is at the same time a PK
+        //we can not just set a PK to NULL in the lines below. We have to store
+        //a backup of all values, so we are able to manipulate these items based on the onDelete value later.
+        $this->profileModulesScheduledForDeletion = clone $profileModulesToDelete;
 
         foreach ($profileModulesToDelete as $profileModuleRemoved) {
             $profileModuleRemoved->setProfile(null);

core/lib/Thelia/Model/Base/ProfileModule.php

@@ -58,12 +58,6 @@ abstract class ProfileModule implements ActiveRecordInterface
      */
     protected $virtualColumns = array();
 
-    /**
-     * The value for the id field.
-     * @var        int
-     */
-    protected $id;
-
     /**
      * The value for the profile_id field.
      * @var        int
@@ -384,17 +378,6 @@ abstract class ProfileModule implements ActiveRecordInterface
         return array_keys(get_object_vars($this));
     }
 
-    /**
-     * Get the [id] column value.
-     *
-     * @return   int
-     */
-    public function getId()
-    {
-
-        return $this->id;
-    }
-
     /**
      * Get the [profile_id] column value.
      *
@@ -468,27 +451,6 @@ abstract class ProfileModule implements ActiveRecordInterface
         }
     }
 
-    /**
-     * Set the value of [id] column.
-     *
-     * @param      int $v new value
-     * @return   \Thelia\Model\ProfileModule The current object (for fluent API support)
-     */
-    public function setId($v)
-    {
-        if ($v !== null) {
-            $v = (int) $v;
-        }
-
-        if ($this->id !== $v) {
-            $this->id = $v;
-            $this->modifiedColumns[] = ProfileModuleTableMap::ID;
-        }
-
-
-        return $this;
-    } // setId()
-
     /**
      * Set the value of [profile_id] column.
      *
@@ -643,25 +605,22 @@ abstract class ProfileModule implements ActiveRecordInterface
         try {
 
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ProfileModuleTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->id = (null !== $col) ? (int) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ProfileModuleTableMap::translateFieldName('ProfileId', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ProfileModuleTableMap::translateFieldName('ProfileId', TableMap::TYPE_PHPNAME, $indexType)];
             $this->profile_id = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ProfileModuleTableMap::translateFieldName('ModuleId', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ProfileModuleTableMap::translateFieldName('ModuleId', TableMap::TYPE_PHPNAME, $indexType)];
             $this->module_id = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ProfileModuleTableMap::translateFieldName('Access', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ProfileModuleTableMap::translateFieldName('Access', TableMap::TYPE_PHPNAME, $indexType)];
             $this->access = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ProfileModuleTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ProfileModuleTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
             $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ProfileModuleTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ProfileModuleTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
@@ -674,7 +633,7 @@ abstract class ProfileModule implements ActiveRecordInterface
                 $this->ensureConsistency();
             }
 
-            return $startcol + 6; // 6 = ProfileModuleTableMap::NUM_HYDRATE_COLUMNS.
+            return $startcol + 5; // 5 = ProfileModuleTableMap::NUM_HYDRATE_COLUMNS.
 
         } catch (Exception $e) {
             throw new PropelException("Error populating \Thelia\Model\ProfileModule object", 0, $e);
@@ -915,15 +874,8 @@ abstract class ProfileModule implements ActiveRecordInterface
         $modifiedColumns = array();
         $index = 0;
 
-        $this->modifiedColumns[] = ProfileModuleTableMap::ID;
-        if (null !== $this->id) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key (' . ProfileModuleTableMap::ID . ')');
-        }
 
          // check the columns in natural order for more readable SQL queries
-        if ($this->isColumnModified(ProfileModuleTableMap::ID)) {
-            $modifiedColumns[':p' . $index++]  = 'ID';
-        }
         if ($this->isColumnModified(ProfileModuleTableMap::PROFILE_ID)) {
             $modifiedColumns[':p' . $index++]  = 'PROFILE_ID';
         }
@@ -950,9 +902,6 @@ abstract class ProfileModule implements ActiveRecordInterface
             $stmt = $con->prepare($sql);
             foreach ($modifiedColumns as $identifier => $columnName) {
                 switch ($columnName) {
-                    case 'ID':
-                        $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
-                        break;
                     case 'PROFILE_ID':
                         $stmt->bindValue($identifier, $this->profile_id, PDO::PARAM_INT);
                         break;
@@ -976,13 +925,6 @@ abstract class ProfileModule implements ActiveRecordInterface
             throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e);
         }
 
-        try {
-            $pk = $con->lastInsertId();
-        } catch (Exception $e) {
-            throw new PropelException('Unable to get autoincrement id.', 0, $e);
-        }
-        $this->setId($pk);
-
         $this->setNew(false);
     }
 
@@ -1031,21 +973,18 @@ abstract class ProfileModule implements ActiveRecordInterface
     {
         switch ($pos) {
             case 0:
-                return $this->getId();
-                break;
-            case 1:
                 return $this->getProfileId();
                 break;
-            case 2:
+            case 1:
                 return $this->getModuleId();
                 break;
-            case 3:
+            case 2:
                 return $this->getAccess();
                 break;
-            case 4:
+            case 3:
                 return $this->getCreatedAt();
                 break;
-            case 5:
+            case 4:
                 return $this->getUpdatedAt();
                 break;
             default:
@@ -1071,18 +1010,17 @@ abstract class ProfileModule implements ActiveRecordInterface
      */
     public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false)
     {
-        if (isset($alreadyDumpedObjects['ProfileModule'][$this->getPrimaryKey()])) {
+        if (isset($alreadyDumpedObjects['ProfileModule'][serialize($this->getPrimaryKey())])) {
             return '*RECURSION*';
         }
-        $alreadyDumpedObjects['ProfileModule'][$this->getPrimaryKey()] = true;
+        $alreadyDumpedObjects['ProfileModule'][serialize($this->getPrimaryKey())] = true;
         $keys = ProfileModuleTableMap::getFieldNames($keyType);
         $result = array(
-            $keys[0] => $this->getId(),
-            $keys[1] => $this->getProfileId(),
-            $keys[2] => $this->getModuleId(),
-            $keys[3] => $this->getAccess(),
-            $keys[4] => $this->getCreatedAt(),
-            $keys[5] => $this->getUpdatedAt(),
+            $keys[0] => $this->getProfileId(),
+            $keys[1] => $this->getModuleId(),
+            $keys[2] => $this->getAccess(),
+            $keys[3] => $this->getCreatedAt(),
+            $keys[4] => $this->getUpdatedAt(),
         );
         $virtualColumns = $this->virtualColumns;
         foreach ($virtualColumns as $key => $virtualColumn) {
@@ -1131,21 +1069,18 @@ abstract class ProfileModule implements ActiveRecordInterface
     {
         switch ($pos) {
             case 0:
-                $this->setId($value);
-                break;
-            case 1:
                 $this->setProfileId($value);
                 break;
-            case 2:
+            case 1:
                 $this->setModuleId($value);
                 break;
-            case 3:
+            case 2:
                 $this->setAccess($value);
                 break;
-            case 4:
+            case 3:
                 $this->setCreatedAt($value);
                 break;
-            case 5:
+            case 4:
                 $this->setUpdatedAt($value);
                 break;
         } // switch()
@@ -1172,12 +1107,11 @@ abstract class ProfileModule implements ActiveRecordInterface
     {
         $keys = ProfileModuleTableMap::getFieldNames($keyType);
 
-        if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
-        if (array_key_exists($keys[1], $arr)) $this->setProfileId($arr[$keys[1]]);
-        if (array_key_exists($keys[2], $arr)) $this->setModuleId($arr[$keys[2]]);
-        if (array_key_exists($keys[3], $arr)) $this->setAccess($arr[$keys[3]]);
-        if (array_key_exists($keys[4], $arr)) $this->setCreatedAt($arr[$keys[4]]);
-        if (array_key_exists($keys[5], $arr)) $this->setUpdatedAt($arr[$keys[5]]);
+        if (array_key_exists($keys[0], $arr)) $this->setProfileId($arr[$keys[0]]);
+        if (array_key_exists($keys[1], $arr)) $this->setModuleId($arr[$keys[1]]);
+        if (array_key_exists($keys[2], $arr)) $this->setAccess($arr[$keys[2]]);
+        if (array_key_exists($keys[3], $arr)) $this->setCreatedAt($arr[$keys[3]]);
+        if (array_key_exists($keys[4], $arr)) $this->setUpdatedAt($arr[$keys[4]]);
     }
 
     /**
@@ -1189,7 +1123,6 @@ abstract class ProfileModule implements ActiveRecordInterface
     {
         $criteria = new Criteria(ProfileModuleTableMap::DATABASE_NAME);
 
-        if ($this->isColumnModified(ProfileModuleTableMap::ID)) $criteria->add(ProfileModuleTableMap::ID, $this->id);
         if ($this->isColumnModified(ProfileModuleTableMap::PROFILE_ID)) $criteria->add(ProfileModuleTableMap::PROFILE_ID, $this->profile_id);
         if ($this->isColumnModified(ProfileModuleTableMap::MODULE_ID)) $criteria->add(ProfileModuleTableMap::MODULE_ID, $this->module_id);
         if ($this->isColumnModified(ProfileModuleTableMap::ACCESS)) $criteria->add(ProfileModuleTableMap::ACCESS, $this->access);
@@ -1210,29 +1143,36 @@ abstract class ProfileModule implements ActiveRecordInterface
     public function buildPkeyCriteria()
     {
         $criteria = new Criteria(ProfileModuleTableMap::DATABASE_NAME);
-        $criteria->add(ProfileModuleTableMap::ID, $this->id);
+        $criteria->add(ProfileModuleTableMap::PROFILE_ID, $this->profile_id);
+        $criteria->add(ProfileModuleTableMap::MODULE_ID, $this->module_id);
 
         return $criteria;
     }
 
     /**
-     * Returns the primary key for this object (row).
-     * @return   int
+     * Returns the composite primary key for this object.
+     * The array elements will be in same order as specified in XML.
+     * @return array
      */
     public function getPrimaryKey()
     {
-        return $this->getId();
+        $pks = array();
+        $pks[0] = $this->getProfileId();
+        $pks[1] = $this->getModuleId();
+
+        return $pks;
     }
 
     /**
-     * Generic method to set the primary key (id column).
+     * Set the [composite] primary key.
      *
-     * @param       int $key Primary key.
+     * @param      array $keys The elements of the composite key (order must match the order in XML file).
      * @return void
      */
-    public function setPrimaryKey($key)
+    public function setPrimaryKey($keys)
     {
-        $this->setId($key);
+        $this->setProfileId($keys[0]);
+        $this->setModuleId($keys[1]);
     }
 
     /**
@@ -1242,7 +1182,7 @@ abstract class ProfileModule implements ActiveRecordInterface
     public function isPrimaryKeyNull()
     {
 
-        return null === $this->getId();
+        return (null === $this->getProfileId()) && (null === $this->getModuleId());
     }
 
     /**
@@ -1265,7 +1205,6 @@ abstract class ProfileModule implements ActiveRecordInterface
         $copyObj->setUpdatedAt($this->getUpdatedAt());
         if ($makeNew) {
             $copyObj->setNew(true);
-            $copyObj->setId(NULL); // this is a auto-increment column, so set to default value
         }
     }
 
@@ -1398,7 +1337,6 @@ abstract class ProfileModule implements ActiveRecordInterface
      */
     public function clear()
     {
-        $this->id = null;
         $this->profile_id = null;
         $this->module_id = null;
         $this->access = null;

core/lib/Thelia/Model/Base/ProfileModuleQuery.php

@@ -21,14 +21,12 @@ use Thelia\Model\Map\ProfileModuleTableMap;
  *
  *
  *
- * @method     ChildProfileModuleQuery orderById($order = Criteria::ASC) Order by the id column
  * @method     ChildProfileModuleQuery orderByProfileId($order = Criteria::ASC) Order by the profile_id column
  * @method     ChildProfileModuleQuery orderByModuleId($order = Criteria::ASC) Order by the module_id column
  * @method     ChildProfileModuleQuery orderByAccess($order = Criteria::ASC) Order by the access column
  * @method     ChildProfileModuleQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
  * @method     ChildProfileModuleQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
  *
- * @method     ChildProfileModuleQuery groupById() Group by the id column
  * @method     ChildProfileModuleQuery groupByProfileId() Group by the profile_id column
  * @method     ChildProfileModuleQuery groupByModuleId() Group by the module_id column
  * @method     ChildProfileModuleQuery groupByAccess() Group by the access column
@@ -50,14 +48,12 @@ use Thelia\Model\Map\ProfileModuleTableMap;
  * @method     ChildProfileModule findOne(ConnectionInterface $con = null) Return the first ChildProfileModule matching the query
  * @method     ChildProfileModule findOneOrCreate(ConnectionInterface $con = null) Return the first ChildProfileModule matching the query, or a new ChildProfileModule object populated from the query conditions when no match is found
  *
- * @method     ChildProfileModule findOneById(int $id) Return the first ChildProfileModule filtered by the id column
  * @method     ChildProfileModule findOneByProfileId(int $profile_id) Return the first ChildProfileModule filtered by the profile_id column
  * @method     ChildProfileModule findOneByModuleId(int $module_id) Return the first ChildProfileModule filtered by the module_id column
  * @method     ChildProfileModule findOneByAccess(int $access) Return the first ChildProfileModule filtered by the access column
  * @method     ChildProfileModule findOneByCreatedAt(string $created_at) Return the first ChildProfileModule filtered by the created_at column
  * @method     ChildProfileModule findOneByUpdatedAt(string $updated_at) Return the first ChildProfileModule filtered by the updated_at column
  *
- * @method     array findById(int $id) Return ChildProfileModule objects filtered by the id column
  * @method     array findByProfileId(int $profile_id) Return ChildProfileModule objects filtered by the profile_id column
  * @method     array findByModuleId(int $module_id) Return ChildProfileModule objects filtered by the module_id column
  * @method     array findByAccess(int $access) Return ChildProfileModule objects filtered by the access column
@@ -110,10 +106,10 @@ abstract class ProfileModuleQuery extends ModelCriteria
      * Go fast if the query is untouched.
      *
      * <code>
-     * $obj  = $c->findPk(12, $con);
+     * $obj = $c->findPk(array(12, 34), $con);
      * </code>
      *
-     * @param mixed $key Primary key to use for the query
+     * @param array[$profile_id, $module_id] $key Primary key to use for the query
      * @param ConnectionInterface $con an optional connection object
      *
      * @return ChildProfileModule|array|mixed the result, formatted by the current formatter
@@ -123,7 +119,7 @@ abstract class ProfileModuleQuery extends ModelCriteria
         if ($key === null) {
             return null;
         }
-        if ((null !== ($obj = ProfileModuleTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
+        if ((null !== ($obj = ProfileModuleTableMap::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1]))))) && !$this->formatter) {
             // the object is already in the instance pool
             return $obj;
         }
@@ -151,10 +147,11 @@ abstract class ProfileModuleQuery extends ModelCriteria
      */
     protected function findPkSimple($key, $con)
     {
-        $sql = 'SELECT ID, PROFILE_ID, MODULE_ID, ACCESS, CREATED_AT, UPDATED_AT FROM profile_module WHERE ID = :p0';
+        $sql = 'SELECT PROFILE_ID, MODULE_ID, ACCESS, CREATED_AT, UPDATED_AT FROM profile_module WHERE PROFILE_ID = :p0 AND MODULE_ID = :p1';
         try {
             $stmt = $con->prepare($sql);
-            $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
+            $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT);
+            $stmt->bindValue(':p1', $key[1], PDO::PARAM_INT);
             $stmt->execute();
         } catch (Exception $e) {
             Propel::log($e->getMessage(), Propel::LOG_ERR);
@@ -164,7 +161,7 @@ abstract class ProfileModuleQuery extends ModelCriteria
         if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
             $obj = new ChildProfileModule();
             $obj->hydrate($row);
-            ProfileModuleTableMap::addInstanceToPool($obj, (string) $key);
+            ProfileModuleTableMap::addInstanceToPool($obj, serialize(array((string) $key[0], (string) $key[1])));
         }
         $stmt->closeCursor();
 
@@ -193,7 +190,7 @@ abstract class ProfileModuleQuery extends ModelCriteria
     /**
      * Find objects by primary key
      * <code>
-     * $objs = $c->findPks(array(12, 56, 832), $con);
+     * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con);
      * </code>
      * @param     array $keys Primary keys to use for the query
      * @param     ConnectionInterface $con an optional connection object
@@ -223,8 +220,10 @@ abstract class ProfileModuleQuery extends ModelCriteria
      */
     public function filterByPrimaryKey($key)
     {
+        $this->addUsingAlias(ProfileModuleTableMap::PROFILE_ID, $key[0], Criteria::EQUAL);
+        $this->addUsingAlias(ProfileModuleTableMap::MODULE_ID, $key[1], Criteria::EQUAL);
 
-        return $this->addUsingAlias(ProfileModuleTableMap::ID, $key, Criteria::EQUAL);
+        return $this;
     }
 
     /**
@@ -236,49 +235,17 @@ abstract class ProfileModuleQuery extends ModelCriteria
      */
     public function filterByPrimaryKeys($keys)
     {
-
-        return $this->addUsingAlias(ProfileModuleTableMap::ID, $keys, Criteria::IN);
-    }
-
-    /**
-     * Filter the query on the id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterById(1234); // WHERE id = 1234
-     * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
-     * $query->filterById(array('min' => 12)); // WHERE id > 12
-     * </code>
-     *
-     * @param     mixed $id The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildProfileModuleQuery The current query, for fluid interface
-     */
-    public function filterById($id = null, $comparison = null)
-    {
-        if (is_array($id)) {
-            $useMinMax = false;
-            if (isset($id['min'])) {
-                $this->addUsingAlias(ProfileModuleTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($id['max'])) {
-                $this->addUsingAlias(ProfileModuleTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
+        if (empty($keys)) {
+            return $this->add(null, '1<>1', Criteria::CUSTOM);
+        }
+        foreach ($keys as $key) {
+            $cton0 = $this->getNewCriterion(ProfileModuleTableMap::PROFILE_ID, $key[0], Criteria::EQUAL);
+            $cton1 = $this->getNewCriterion(ProfileModuleTableMap::MODULE_ID, $key[1], Criteria::EQUAL);
+            $cton0->addAnd($cton1);
+            $this->addOr($cton0);
         }
 
-        return $this->addUsingAlias(ProfileModuleTableMap::ID, $id, $comparison);
+        return $this;
     }
 
     /**
@@ -602,7 +569,7 @@ abstract class ProfileModuleQuery extends ModelCriteria
      *
      * @return ChildProfileModuleQuery The current query, for fluid interface
      */
-    public function joinModule($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    public function joinModule($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
         $tableMap = $this->getTableMap();
         $relationMap = $tableMap->getRelation('Module');
@@ -637,7 +604,7 @@ abstract class ProfileModuleQuery extends ModelCriteria
      *
      * @return   \Thelia\Model\ModuleQuery A secondary query class using the current class as primary query
      */
-    public function useModuleQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    public function useModuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
         return $this
             ->joinModule($relationAlias, $joinType)
@@ -654,7 +621,9 @@ abstract class ProfileModuleQuery extends ModelCriteria
     public function prune($profileModule = null)
     {
         if ($profileModule) {
-            $this->addUsingAlias(ProfileModuleTableMap::ID, $profileModule->getId(), Criteria::NOT_EQUAL);
+            $this->addCond('pruneCond0', $this->getAliasedColName(ProfileModuleTableMap::PROFILE_ID), $profileModule->getProfileId(), Criteria::NOT_EQUAL);
+            $this->addCond('pruneCond1', $this->getAliasedColName(ProfileModuleTableMap::MODULE_ID), $profileModule->getModuleId(), Criteria::NOT_EQUAL);
+            $this->combine(array('pruneCond0', 'pruneCond1'), Criteria::LOGICAL_OR);
         }
 
         return $this;

core/lib/Thelia/Model/Base/ProfileResource.php

@@ -58,12 +58,6 @@ abstract class ProfileResource implements ActiveRecordInterface
      */
     protected $virtualColumns = array();
 
-    /**
-     * The value for the id field.
-     * @var        int
-     */
-    protected $id;
-
     /**
      * The value for the profile_id field.
      * @var        int
@@ -384,17 +378,6 @@ abstract class ProfileResource implements ActiveRecordInterface
         return array_keys(get_object_vars($this));
     }
 
-    /**
-     * Get the [id] column value.
-     *
-     * @return   int
-     */
-    public function getId()
-    {
-
-        return $this->id;
-    }
-
     /**
      * Get the [profile_id] column value.
      *
@@ -468,27 +451,6 @@ abstract class ProfileResource implements ActiveRecordInterface
         }
     }
 
-    /**
-     * Set the value of [id] column.
-     *
-     * @param      int $v new value
-     * @return   \Thelia\Model\ProfileResource The current object (for fluent API support)
-     */
-    public function setId($v)
-    {
-        if ($v !== null) {
-            $v = (int) $v;
-        }
-
-        if ($this->id !== $v) {
-            $this->id = $v;
-            $this->modifiedColumns[] = ProfileResourceTableMap::ID;
-        }
-
-
-        return $this;
-    } // setId()
-
     /**
      * Set the value of [profile_id] column.
      *
@@ -643,25 +605,22 @@ abstract class ProfileResource implements ActiveRecordInterface
         try {
 
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ProfileResourceTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->id = (null !== $col) ? (int) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ProfileResourceTableMap::translateFieldName('ProfileId', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ProfileResourceTableMap::translateFieldName('ProfileId', TableMap::TYPE_PHPNAME, $indexType)];
             $this->profile_id = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ProfileResourceTableMap::translateFieldName('ResourceId', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ProfileResourceTableMap::translateFieldName('ResourceId', TableMap::TYPE_PHPNAME, $indexType)];
             $this->resource_id = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ProfileResourceTableMap::translateFieldName('Access', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ProfileResourceTableMap::translateFieldName('Access', TableMap::TYPE_PHPNAME, $indexType)];
             $this->access = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ProfileResourceTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ProfileResourceTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
             $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ProfileResourceTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ProfileResourceTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
@@ -674,7 +633,7 @@ abstract class ProfileResource implements ActiveRecordInterface
                 $this->ensureConsistency();
             }
 
-            return $startcol + 6; // 6 = ProfileResourceTableMap::NUM_HYDRATE_COLUMNS.
+            return $startcol + 5; // 5 = ProfileResourceTableMap::NUM_HYDRATE_COLUMNS.
 
         } catch (Exception $e) {
             throw new PropelException("Error populating \Thelia\Model\ProfileResource object", 0, $e);
@@ -915,15 +874,8 @@ abstract class ProfileResource implements ActiveRecordInterface
         $modifiedColumns = array();
         $index = 0;
 
-        $this->modifiedColumns[] = ProfileResourceTableMap::ID;
-        if (null !== $this->id) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key (' . ProfileResourceTableMap::ID . ')');
-        }
 
          // check the columns in natural order for more readable SQL queries
-        if ($this->isColumnModified(ProfileResourceTableMap::ID)) {
-            $modifiedColumns[':p' . $index++]  = 'ID';
-        }
         if ($this->isColumnModified(ProfileResourceTableMap::PROFILE_ID)) {
             $modifiedColumns[':p' . $index++]  = 'PROFILE_ID';
         }
@@ -950,9 +902,6 @@ abstract class ProfileResource implements ActiveRecordInterface
             $stmt = $con->prepare($sql);
             foreach ($modifiedColumns as $identifier => $columnName) {
                 switch ($columnName) {
-                    case 'ID':
-                        $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
-                        break;
                     case 'PROFILE_ID':
                         $stmt->bindValue($identifier, $this->profile_id, PDO::PARAM_INT);
                         break;
@@ -976,13 +925,6 @@ abstract class ProfileResource implements ActiveRecordInterface
             throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e);
         }
 
-        try {
-            $pk = $con->lastInsertId();
-        } catch (Exception $e) {
-            throw new PropelException('Unable to get autoincrement id.', 0, $e);
-        }
-        $this->setId($pk);
-
         $this->setNew(false);
     }
 
@@ -1031,21 +973,18 @@ abstract class ProfileResource implements ActiveRecordInterface
     {
         switch ($pos) {
             case 0:
-                return $this->getId();
-                break;
-            case 1:
                 return $this->getProfileId();
                 break;
-            case 2:
+            case 1:
                 return $this->getResourceId();
                 break;
-            case 3:
+            case 2:
                 return $this->getAccess();
                 break;
-            case 4:
+            case 3:
                 return $this->getCreatedAt();
                 break;
-            case 5:
+            case 4:
                 return $this->getUpdatedAt();
                 break;
             default:
@@ -1077,12 +1016,11 @@ abstract class ProfileResource implements ActiveRecordInterface
         $alreadyDumpedObjects['ProfileResource'][serialize($this->getPrimaryKey())] = true;
         $keys = ProfileResourceTableMap::getFieldNames($keyType);
         $result = array(
-            $keys[0] => $this->getId(),
-            $keys[1] => $this->getProfileId(),
-            $keys[2] => $this->getResourceId(),
-            $keys[3] => $this->getAccess(),
-            $keys[4] => $this->getCreatedAt(),
-            $keys[5] => $this->getUpdatedAt(),
+            $keys[0] => $this->getProfileId(),
+            $keys[1] => $this->getResourceId(),
+            $keys[2] => $this->getAccess(),
+            $keys[3] => $this->getCreatedAt(),
+            $keys[4] => $this->getUpdatedAt(),
         );
         $virtualColumns = $this->virtualColumns;
         foreach ($virtualColumns as $key => $virtualColumn) {
@@ -1131,21 +1069,18 @@ abstract class ProfileResource implements ActiveRecordInterface
     {
         switch ($pos) {
             case 0:
-                $this->setId($value);
-                break;
-            case 1:
                 $this->setProfileId($value);
                 break;
-            case 2:
+            case 1:
                 $this->setResourceId($value);
                 break;
-            case 3:
+            case 2:
                 $this->setAccess($value);
                 break;
-            case 4:
+            case 3:
                 $this->setCreatedAt($value);
                 break;
-            case 5:
+            case 4:
                 $this->setUpdatedAt($value);
                 break;
         } // switch()
@@ -1172,12 +1107,11 @@ abstract class ProfileResource implements ActiveRecordInterface
     {
         $keys = ProfileResourceTableMap::getFieldNames($keyType);
 
-        if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
-        if (array_key_exists($keys[1], $arr)) $this->setProfileId($arr[$keys[1]]);
-        if (array_key_exists($keys[2], $arr)) $this->setResourceId($arr[$keys[2]]);
-        if (array_key_exists($keys[3], $arr)) $this->setAccess($arr[$keys[3]]);
-        if (array_key_exists($keys[4], $arr)) $this->setCreatedAt($arr[$keys[4]]);
-        if (array_key_exists($keys[5], $arr)) $this->setUpdatedAt($arr[$keys[5]]);
+        if (array_key_exists($keys[0], $arr)) $this->setProfileId($arr[$keys[0]]);
+        if (array_key_exists($keys[1], $arr)) $this->setResourceId($arr[$keys[1]]);
+        if (array_key_exists($keys[2], $arr)) $this->setAccess($arr[$keys[2]]);
+        if (array_key_exists($keys[3], $arr)) $this->setCreatedAt($arr[$keys[3]]);
+        if (array_key_exists($keys[4], $arr)) $this->setUpdatedAt($arr[$keys[4]]);
     }
 
     /**
@@ -1189,7 +1123,6 @@ abstract class ProfileResource implements ActiveRecordInterface
     {
         $criteria = new Criteria(ProfileResourceTableMap::DATABASE_NAME);
 
-        if ($this->isColumnModified(ProfileResourceTableMap::ID)) $criteria->add(ProfileResourceTableMap::ID, $this->id);
         if ($this->isColumnModified(ProfileResourceTableMap::PROFILE_ID)) $criteria->add(ProfileResourceTableMap::PROFILE_ID, $this->profile_id);
         if ($this->isColumnModified(ProfileResourceTableMap::RESOURCE_ID)) $criteria->add(ProfileResourceTableMap::RESOURCE_ID, $this->resource_id);
         if ($this->isColumnModified(ProfileResourceTableMap::ACCESS)) $criteria->add(ProfileResourceTableMap::ACCESS, $this->access);
@@ -1210,7 +1143,6 @@ abstract class ProfileResource implements ActiveRecordInterface
     public function buildPkeyCriteria()
     {
         $criteria = new Criteria(ProfileResourceTableMap::DATABASE_NAME);
-        $criteria->add(ProfileResourceTableMap::ID, $this->id);
         $criteria->add(ProfileResourceTableMap::PROFILE_ID, $this->profile_id);
         $criteria->add(ProfileResourceTableMap::RESOURCE_ID, $this->resource_id);
 
@@ -1225,9 +1157,8 @@ abstract class ProfileResource implements ActiveRecordInterface
     public function getPrimaryKey()
     {
         $pks = array();
-        $pks[0] = $this->getId();
-        $pks[1] = $this->getProfileId();
-        $pks[2] = $this->getResourceId();
+        $pks[0] = $this->getProfileId();
+        $pks[1] = $this->getResourceId();
 
         return $pks;
     }
@@ -1240,9 +1171,8 @@ abstract class ProfileResource implements ActiveRecordInterface
      */
     public function setPrimaryKey($keys)
     {
-        $this->setId($keys[0]);
-        $this->setProfileId($keys[1]);
-        $this->setResourceId($keys[2]);
+        $this->setProfileId($keys[0]);
+        $this->setResourceId($keys[1]);
     }
 
     /**
@@ -1252,7 +1182,7 @@ abstract class ProfileResource implements ActiveRecordInterface
     public function isPrimaryKeyNull()
     {
 
-        return (null === $this->getId()) && (null === $this->getProfileId()) && (null === $this->getResourceId());
+        return (null === $this->getProfileId()) && (null === $this->getResourceId());
     }
 
     /**
@@ -1275,7 +1205,6 @@ abstract class ProfileResource implements ActiveRecordInterface
         $copyObj->setUpdatedAt($this->getUpdatedAt());
         if ($makeNew) {
             $copyObj->setNew(true);
-            $copyObj->setId(NULL); // this is a auto-increment column, so set to default value
         }
     }
 
@@ -1408,7 +1337,6 @@ abstract class ProfileResource implements ActiveRecordInterface
      */
     public function clear()
     {
-        $this->id = null;
         $this->profile_id = null;
         $this->resource_id = null;
         $this->access = null;

core/lib/Thelia/Model/Base/ProfileResourceQuery.php

@@ -21,14 +21,12 @@ use Thelia\Model\Map\ProfileResourceTableMap;
  *
  *
  *
- * @method     ChildProfileResourceQuery orderById($order = Criteria::ASC) Order by the id column
  * @method     ChildProfileResourceQuery orderByProfileId($order = Criteria::ASC) Order by the profile_id column
  * @method     ChildProfileResourceQuery orderByResourceId($order = Criteria::ASC) Order by the resource_id column
  * @method     ChildProfileResourceQuery orderByAccess($order = Criteria::ASC) Order by the access column
  * @method     ChildProfileResourceQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
  * @method     ChildProfileResourceQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
  *
- * @method     ChildProfileResourceQuery groupById() Group by the id column
  * @method     ChildProfileResourceQuery groupByProfileId() Group by the profile_id column
  * @method     ChildProfileResourceQuery groupByResourceId() Group by the resource_id column
  * @method     ChildProfileResourceQuery groupByAccess() Group by the access column
@@ -50,14 +48,12 @@ use Thelia\Model\Map\ProfileResourceTableMap;
  * @method     ChildProfileResource findOne(ConnectionInterface $con = null) Return the first ChildProfileResource matching the query
  * @method     ChildProfileResource findOneOrCreate(ConnectionInterface $con = null) Return the first ChildProfileResource matching the query, or a new ChildProfileResource object populated from the query conditions when no match is found
  *
- * @method     ChildProfileResource findOneById(int $id) Return the first ChildProfileResource filtered by the id column
  * @method     ChildProfileResource findOneByProfileId(int $profile_id) Return the first ChildProfileResource filtered by the profile_id column
  * @method     ChildProfileResource findOneByResourceId(int $resource_id) Return the first ChildProfileResource filtered by the resource_id column
  * @method     ChildProfileResource findOneByAccess(int $access) Return the first ChildProfileResource filtered by the access column
  * @method     ChildProfileResource findOneByCreatedAt(string $created_at) Return the first ChildProfileResource filtered by the created_at column
  * @method     ChildProfileResource findOneByUpdatedAt(string $updated_at) Return the first ChildProfileResource filtered by the updated_at column
  *
- * @method     array findById(int $id) Return ChildProfileResource objects filtered by the id column
  * @method     array findByProfileId(int $profile_id) Return ChildProfileResource objects filtered by the profile_id column
  * @method     array findByResourceId(int $resource_id) Return ChildProfileResource objects filtered by the resource_id column
  * @method     array findByAccess(int $access) Return ChildProfileResource objects filtered by the access column
@@ -110,10 +106,10 @@ abstract class ProfileResourceQuery extends ModelCriteria
      * Go fast if the query is untouched.
      *
      * <code>
-     * $obj = $c->findPk(array(12, 34, 56), $con);
+     * $obj = $c->findPk(array(12, 34), $con);
      * </code>
      *
-     * @param array[$id, $profile_id, $resource_id] $key Primary key to use for the query
+     * @param array[$profile_id, $resource_id] $key Primary key to use for the query
      * @param ConnectionInterface $con an optional connection object
      *
      * @return ChildProfileResource|array|mixed the result, formatted by the current formatter
@@ -123,7 +119,7 @@ abstract class ProfileResourceQuery extends ModelCriteria
         if ($key === null) {
             return null;
         }
-        if ((null !== ($obj = ProfileResourceTableMap::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1], (string) $key[2]))))) && !$this->formatter) {
+        if ((null !== ($obj = ProfileResourceTableMap::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1]))))) && !$this->formatter) {
             // the object is already in the instance pool
             return $obj;
         }
@@ -151,12 +147,11 @@ abstract class ProfileResourceQuery extends ModelCriteria
      */
     protected function findPkSimple($key, $con)
     {
-        $sql = 'SELECT ID, PROFILE_ID, RESOURCE_ID, ACCESS, CREATED_AT, UPDATED_AT FROM profile_resource WHERE ID = :p0 AND PROFILE_ID = :p1 AND RESOURCE_ID = :p2';
+        $sql = 'SELECT PROFILE_ID, RESOURCE_ID, ACCESS, CREATED_AT, UPDATED_AT FROM profile_resource WHERE PROFILE_ID = :p0 AND RESOURCE_ID = :p1';
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT);
             $stmt->bindValue(':p1', $key[1], PDO::PARAM_INT);
-            $stmt->bindValue(':p2', $key[2], PDO::PARAM_INT);
             $stmt->execute();
         } catch (Exception $e) {
             Propel::log($e->getMessage(), Propel::LOG_ERR);
@@ -166,7 +161,7 @@ abstract class ProfileResourceQuery extends ModelCriteria
         if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
             $obj = new ChildProfileResource();
             $obj->hydrate($row);
-            ProfileResourceTableMap::addInstanceToPool($obj, serialize(array((string) $key[0], (string) $key[1], (string) $key[2])));
+            ProfileResourceTableMap::addInstanceToPool($obj, serialize(array((string) $key[0], (string) $key[1])));
         }
         $stmt->closeCursor();
 
@@ -225,9 +220,8 @@ abstract class ProfileResourceQuery extends ModelCriteria
      */
     public function filterByPrimaryKey($key)
     {
-        $this->addUsingAlias(ProfileResourceTableMap::ID, $key[0], Criteria::EQUAL);
-        $this->addUsingAlias(ProfileResourceTableMap::PROFILE_ID, $key[1], Criteria::EQUAL);
-        $this->addUsingAlias(ProfileResourceTableMap::RESOURCE_ID, $key[2], Criteria::EQUAL);
+        $this->addUsingAlias(ProfileResourceTableMap::PROFILE_ID, $key[0], Criteria::EQUAL);
+        $this->addUsingAlias(ProfileResourceTableMap::RESOURCE_ID, $key[1], Criteria::EQUAL);
 
         return $this;
     }
@@ -245,58 +239,15 @@ abstract class ProfileResourceQuery extends ModelCriteria
             return $this->add(null, '1<>1', Criteria::CUSTOM);
         }
         foreach ($keys as $key) {
-            $cton0 = $this->getNewCriterion(ProfileResourceTableMap::ID, $key[0], Criteria::EQUAL);
-            $cton1 = $this->getNewCriterion(ProfileResourceTableMap::PROFILE_ID, $key[1], Criteria::EQUAL);
+            $cton0 = $this->getNewCriterion(ProfileResourceTableMap::PROFILE_ID, $key[0], Criteria::EQUAL);
+            $cton1 = $this->getNewCriterion(ProfileResourceTableMap::RESOURCE_ID, $key[1], Criteria::EQUAL);
             $cton0->addAnd($cton1);
-            $cton2 = $this->getNewCriterion(ProfileResourceTableMap::RESOURCE_ID, $key[2], Criteria::EQUAL);
-            $cton0->addAnd($cton2);
             $this->addOr($cton0);
         }
 
         return $this;
     }
 
-    /**
-     * Filter the query on the id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterById(1234); // WHERE id = 1234
-     * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
-     * $query->filterById(array('min' => 12)); // WHERE id > 12
-     * </code>
-     *
-     * @param     mixed $id The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildProfileResourceQuery The current query, for fluid interface
-     */
-    public function filterById($id = null, $comparison = null)
-    {
-        if (is_array($id)) {
-            $useMinMax = false;
-            if (isset($id['min'])) {
-                $this->addUsingAlias(ProfileResourceTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($id['max'])) {
-                $this->addUsingAlias(ProfileResourceTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(ProfileResourceTableMap::ID, $id, $comparison);
-    }
-
     /**
      * Filter the query on the profile_id column
      *
@@ -670,10 +621,9 @@ abstract class ProfileResourceQuery extends ModelCriteria
     public function prune($profileResource = null)
     {
         if ($profileResource) {
-            $this->addCond('pruneCond0', $this->getAliasedColName(ProfileResourceTableMap::ID), $profileResource->getId(), Criteria::NOT_EQUAL);
-            $this->addCond('pruneCond1', $this->getAliasedColName(ProfileResourceTableMap::PROFILE_ID), $profileResource->getProfileId(), Criteria::NOT_EQUAL);
-            $this->addCond('pruneCond2', $this->getAliasedColName(ProfileResourceTableMap::RESOURCE_ID), $profileResource->getResourceId(), Criteria::NOT_EQUAL);
-            $this->combine(array('pruneCond0', 'pruneCond1', 'pruneCond2'), Criteria::LOGICAL_OR);
+            $this->addCond('pruneCond0', $this->getAliasedColName(ProfileResourceTableMap::PROFILE_ID), $profileResource->getProfileId(), Criteria::NOT_EQUAL);
+            $this->addCond('pruneCond1', $this->getAliasedColName(ProfileResourceTableMap::RESOURCE_ID), $profileResource->getResourceId(), Criteria::NOT_EQUAL);
+            $this->combine(array('pruneCond0', 'pruneCond1'), Criteria::LOGICAL_OR);
         }
 
         return $this;

core/lib/Thelia/Model/Map/ProfileModuleTableMap.php

@@ -57,7 +57,7 @@ class ProfileModuleTableMap extends TableMap
     /**
      * The total number of columns
      */
-    const NUM_COLUMNS = 6;
+    const NUM_COLUMNS = 5;
 
     /**
      * The number of lazy-loaded columns
@@ -67,12 +67,7 @@ class ProfileModuleTableMap extends TableMap
     /**
      * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
      */
-    const NUM_HYDRATE_COLUMNS = 6;
-
-    /**
-     * the column name for the ID field
-     */
-    const ID = 'profile_module.ID';
+    const NUM_HYDRATE_COLUMNS = 5;
 
     /**
      * the column name for the PROFILE_ID field
@@ -111,12 +106,12 @@ class ProfileModuleTableMap extends TableMap
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'ProfileId', 'ModuleId', 'Access', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'profileId', 'moduleId', 'access', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(ProfileModuleTableMap::ID, ProfileModuleTableMap::PROFILE_ID, ProfileModuleTableMap::MODULE_ID, ProfileModuleTableMap::ACCESS, ProfileModuleTableMap::CREATED_AT, ProfileModuleTableMap::UPDATED_AT, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'PROFILE_ID', 'MODULE_ID', 'ACCESS', 'CREATED_AT', 'UPDATED_AT', ),
-        self::TYPE_FIELDNAME     => array('id', 'profile_id', 'module_id', 'access', 'created_at', 'updated_at', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, )
+        self::TYPE_PHPNAME       => array('ProfileId', 'ModuleId', 'Access', 'CreatedAt', 'UpdatedAt', ),
+        self::TYPE_STUDLYPHPNAME => array('profileId', 'moduleId', 'access', 'createdAt', 'updatedAt', ),
+        self::TYPE_COLNAME       => array(ProfileModuleTableMap::PROFILE_ID, ProfileModuleTableMap::MODULE_ID, ProfileModuleTableMap::ACCESS, ProfileModuleTableMap::CREATED_AT, ProfileModuleTableMap::UPDATED_AT, ),
+        self::TYPE_RAW_COLNAME   => array('PROFILE_ID', 'MODULE_ID', 'ACCESS', 'CREATED_AT', 'UPDATED_AT', ),
+        self::TYPE_FIELDNAME     => array('profile_id', 'module_id', 'access', 'created_at', 'updated_at', ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, )
     );
 
     /**
@@ -126,12 +121,12 @@ class ProfileModuleTableMap extends TableMap
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
     protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'ProfileId' => 1, 'ModuleId' => 2, 'Access' => 3, 'CreatedAt' => 4, 'UpdatedAt' => 5, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'profileId' => 1, 'moduleId' => 2, 'access' => 3, 'createdAt' => 4, 'updatedAt' => 5, ),
-        self::TYPE_COLNAME       => array(ProfileModuleTableMap::ID => 0, ProfileModuleTableMap::PROFILE_ID => 1, ProfileModuleTableMap::MODULE_ID => 2, ProfileModuleTableMap::ACCESS => 3, ProfileModuleTableMap::CREATED_AT => 4, ProfileModuleTableMap::UPDATED_AT => 5, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'PROFILE_ID' => 1, 'MODULE_ID' => 2, 'ACCESS' => 3, 'CREATED_AT' => 4, 'UPDATED_AT' => 5, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'profile_id' => 1, 'module_id' => 2, 'access' => 3, 'created_at' => 4, 'updated_at' => 5, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, )
+        self::TYPE_PHPNAME       => array('ProfileId' => 0, 'ModuleId' => 1, 'Access' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, ),
+        self::TYPE_STUDLYPHPNAME => array('profileId' => 0, 'moduleId' => 1, 'access' => 2, 'createdAt' => 3, 'updatedAt' => 4, ),
+        self::TYPE_COLNAME       => array(ProfileModuleTableMap::PROFILE_ID => 0, ProfileModuleTableMap::MODULE_ID => 1, ProfileModuleTableMap::ACCESS => 2, ProfileModuleTableMap::CREATED_AT => 3, ProfileModuleTableMap::UPDATED_AT => 4, ),
+        self::TYPE_RAW_COLNAME   => array('PROFILE_ID' => 0, 'MODULE_ID' => 1, 'ACCESS' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, ),
+        self::TYPE_FIELDNAME     => array('profile_id' => 0, 'module_id' => 1, 'access' => 2, 'created_at' => 3, 'updated_at' => 4, ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, )
     );
 
     /**
@@ -148,12 +143,11 @@ class ProfileModuleTableMap extends TableMap
         $this->setPhpName('ProfileModule');
         $this->setClassName('\\Thelia\\Model\\ProfileModule');
         $this->setPackage('Thelia.Model');
-        $this->setUseIdGenerator(true);
+        $this->setUseIdGenerator(false);
         // columns
-        $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
-        $this->addForeignKey('PROFILE_ID', 'ProfileId', 'INTEGER', 'profile', 'ID', true, null, null);
-        $this->addForeignKey('MODULE_ID', 'ModuleId', 'INTEGER', 'module', 'ID', false, null, null);
-        $this->addColumn('ACCESS', 'Access', 'TINYINT', false, null, 0);
+        $this->addForeignPrimaryKey('PROFILE_ID', 'ProfileId', 'INTEGER' , 'profile', 'ID', true, null, null);
+        $this->addForeignPrimaryKey('MODULE_ID', 'ModuleId', 'INTEGER' , 'module', 'ID', true, null, null);
+        $this->addColumn('ACCESS', 'Access', 'INTEGER', true, null, 0);
         $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
         $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
     } // initialize()
@@ -180,6 +174,59 @@ class ProfileModuleTableMap extends TableMap
         );
     } // getBehaviors()
 
+    /**
+     * Adds an object to the instance pool.
+     *
+     * Propel keeps cached copies of objects in an instance pool when they are retrieved
+     * from the database. In some cases you may need to explicitly add objects
+     * to the cache in order to ensure that the same objects are always returned by find*()
+     * and findPk*() calls.
+     *
+     * @param \Thelia\Model\ProfileModule $obj A \Thelia\Model\ProfileModule object.
+     * @param string $key             (optional) key to use for instance map (for performance boost if key was already calculated externally).
+     */
+    public static function addInstanceToPool($obj, $key = null)
+    {
+        if (Propel::isInstancePoolingEnabled()) {
+            if (null === $key) {
+                $key = serialize(array((string) $obj->getProfileId(), (string) $obj->getModuleId()));
+            } // if key === null
+            self::$instances[$key] = $obj;
+        }
+    }
+
+    /**
+     * Removes an object from the instance pool.
+     *
+     * Propel keeps cached copies of objects in an instance pool when they are retrieved
+     * from the database.  In some cases -- especially when you override doDelete
+     * methods in your stub classes -- you may need to explicitly remove objects
+     * from the cache in order to prevent returning objects that no longer exist.
+     *
+     * @param mixed $value A \Thelia\Model\ProfileModule object or a primary key value.
+     */
+    public static function removeInstanceFromPool($value)
+    {
+        if (Propel::isInstancePoolingEnabled() && null !== $value) {
+            if (is_object($value) && $value instanceof \Thelia\Model\ProfileModule) {
+                $key = serialize(array((string) $value->getProfileId(), (string) $value->getModuleId()));
+
+            } elseif (is_array($value) && count($value) === 2) {
+                // assume we've been passed a primary key";
+                $key = serialize(array((string) $value[0], (string) $value[1]));
+            } elseif ($value instanceof Criteria) {
+                self::$instances = [];
+
+                return;
+            } else {
+                $e = new PropelException("Invalid value passed to removeInstanceFromPool().  Expected primary key or \Thelia\Model\ProfileModule object; got " . (is_object($value) ? get_class($value) . ' object.' : var_export($value, true)));
+                throw $e;
+            }
+
+            unset(self::$instances[$key]);
+        }
+    }
+
     /**
      * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
      *
@@ -194,11 +241,11 @@ class ProfileModuleTableMap extends TableMap
     public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
     {
         // If the PK cannot be derived from the row, return NULL.
-        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('ProfileId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('ModuleId', TableMap::TYPE_PHPNAME, $indexType)] === null) {
             return null;
         }
 
-        return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+        return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('ProfileId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('ModuleId', TableMap::TYPE_PHPNAME, $indexType)]));
     }
 
     /**
@@ -216,11 +263,7 @@ class ProfileModuleTableMap extends TableMap
     public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
     {
 
-            return (int) $row[
-                            $indexType == TableMap::TYPE_NUM
-                            ? 0 + $offset
-                            : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
-                        ];
+            return $pks;
     }
 
     /**
@@ -318,14 +361,12 @@ class ProfileModuleTableMap extends TableMap
     public static function addSelectColumns(Criteria $criteria, $alias = null)
     {
         if (null === $alias) {
-            $criteria->addSelectColumn(ProfileModuleTableMap::ID);
             $criteria->addSelectColumn(ProfileModuleTableMap::PROFILE_ID);
             $criteria->addSelectColumn(ProfileModuleTableMap::MODULE_ID);
             $criteria->addSelectColumn(ProfileModuleTableMap::ACCESS);
             $criteria->addSelectColumn(ProfileModuleTableMap::CREATED_AT);
             $criteria->addSelectColumn(ProfileModuleTableMap::UPDATED_AT);
         } else {
-            $criteria->addSelectColumn($alias . '.ID');
             $criteria->addSelectColumn($alias . '.PROFILE_ID');
             $criteria->addSelectColumn($alias . '.MODULE_ID');
             $criteria->addSelectColumn($alias . '.ACCESS');
@@ -382,7 +423,17 @@ class ProfileModuleTableMap extends TableMap
             $criteria = $values->buildPkeyCriteria();
         } else { // it's a primary key, or an array of pks
             $criteria = new Criteria(ProfileModuleTableMap::DATABASE_NAME);
-            $criteria->add(ProfileModuleTableMap::ID, (array) $values, Criteria::IN);
+            // primary key is composite; we therefore, expect
+            // the primary key passed to be an array of pkey values
+            if (count($values) == count($values, COUNT_RECURSIVE)) {
+                // array is not multi-dimensional
+                $values = array($values);
+            }
+            foreach ($values as $value) {
+                $criterion = $criteria->getNewCriterion(ProfileModuleTableMap::PROFILE_ID, $value[0]);
+                $criterion->addAnd($criteria->getNewCriterion(ProfileModuleTableMap::MODULE_ID, $value[1]));
+                $criteria->addOr($criterion);
+            }
         }
 
         $query = ProfileModuleQuery::create()->mergeWith($criteria);
@@ -428,10 +479,6 @@ class ProfileModuleTableMap extends TableMap
             $criteria = $criteria->buildCriteria(); // build Criteria from ProfileModule object
         }
 
-        if ($criteria->containsKey(ProfileModuleTableMap::ID) && $criteria->keyContainsValue(ProfileModuleTableMap::ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.ProfileModuleTableMap::ID.')');
-        }
-
 
         // Set the correct dbName
         $query = ProfileModuleQuery::create()->mergeWith($criteria);

core/lib/Thelia/Model/Map/ProfileResourceTableMap.php

@@ -57,7 +57,7 @@ class ProfileResourceTableMap extends TableMap
     /**
      * The total number of columns
      */
-    const NUM_COLUMNS = 6;
+    const NUM_COLUMNS = 5;
 
     /**
      * The number of lazy-loaded columns
@@ -67,12 +67,7 @@ class ProfileResourceTableMap extends TableMap
     /**
      * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
      */
-    const NUM_HYDRATE_COLUMNS = 6;
-
-    /**
-     * the column name for the ID field
-     */
-    const ID = 'profile_resource.ID';
+    const NUM_HYDRATE_COLUMNS = 5;
 
     /**
      * the column name for the PROFILE_ID field
@@ -111,12 +106,12 @@ class ProfileResourceTableMap extends TableMap
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'ProfileId', 'ResourceId', 'Access', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'profileId', 'resourceId', 'access', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(ProfileResourceTableMap::ID, ProfileResourceTableMap::PROFILE_ID, ProfileResourceTableMap::RESOURCE_ID, ProfileResourceTableMap::ACCESS, ProfileResourceTableMap::CREATED_AT, ProfileResourceTableMap::UPDATED_AT, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'PROFILE_ID', 'RESOURCE_ID', 'ACCESS', 'CREATED_AT', 'UPDATED_AT', ),
-        self::TYPE_FIELDNAME     => array('id', 'profile_id', 'resource_id', 'access', 'created_at', 'updated_at', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, )
+        self::TYPE_PHPNAME       => array('ProfileId', 'ResourceId', 'Access', 'CreatedAt', 'UpdatedAt', ),
+        self::TYPE_STUDLYPHPNAME => array('profileId', 'resourceId', 'access', 'createdAt', 'updatedAt', ),
+        self::TYPE_COLNAME       => array(ProfileResourceTableMap::PROFILE_ID, ProfileResourceTableMap::RESOURCE_ID, ProfileResourceTableMap::ACCESS, ProfileResourceTableMap::CREATED_AT, ProfileResourceTableMap::UPDATED_AT, ),
+        self::TYPE_RAW_COLNAME   => array('PROFILE_ID', 'RESOURCE_ID', 'ACCESS', 'CREATED_AT', 'UPDATED_AT', ),
+        self::TYPE_FIELDNAME     => array('profile_id', 'resource_id', 'access', 'created_at', 'updated_at', ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, )
     );
 
     /**
@@ -126,12 +121,12 @@ class ProfileResourceTableMap extends TableMap
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
     protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'ProfileId' => 1, 'ResourceId' => 2, 'Access' => 3, 'CreatedAt' => 4, 'UpdatedAt' => 5, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'profileId' => 1, 'resourceId' => 2, 'access' => 3, 'createdAt' => 4, 'updatedAt' => 5, ),
-        self::TYPE_COLNAME       => array(ProfileResourceTableMap::ID => 0, ProfileResourceTableMap::PROFILE_ID => 1, ProfileResourceTableMap::RESOURCE_ID => 2, ProfileResourceTableMap::ACCESS => 3, ProfileResourceTableMap::CREATED_AT => 4, ProfileResourceTableMap::UPDATED_AT => 5, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'PROFILE_ID' => 1, 'RESOURCE_ID' => 2, 'ACCESS' => 3, 'CREATED_AT' => 4, 'UPDATED_AT' => 5, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'profile_id' => 1, 'resource_id' => 2, 'access' => 3, 'created_at' => 4, 'updated_at' => 5, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, )
+        self::TYPE_PHPNAME       => array('ProfileId' => 0, 'ResourceId' => 1, 'Access' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, ),
+        self::TYPE_STUDLYPHPNAME => array('profileId' => 0, 'resourceId' => 1, 'access' => 2, 'createdAt' => 3, 'updatedAt' => 4, ),
+        self::TYPE_COLNAME       => array(ProfileResourceTableMap::PROFILE_ID => 0, ProfileResourceTableMap::RESOURCE_ID => 1, ProfileResourceTableMap::ACCESS => 2, ProfileResourceTableMap::CREATED_AT => 3, ProfileResourceTableMap::UPDATED_AT => 4, ),
+        self::TYPE_RAW_COLNAME   => array('PROFILE_ID' => 0, 'RESOURCE_ID' => 1, 'ACCESS' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, ),
+        self::TYPE_FIELDNAME     => array('profile_id' => 0, 'resource_id' => 1, 'access' => 2, 'created_at' => 3, 'updated_at' => 4, ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, )
     );
 
     /**
@@ -148,10 +143,9 @@ class ProfileResourceTableMap extends TableMap
         $this->setPhpName('ProfileResource');
         $this->setClassName('\\Thelia\\Model\\ProfileResource');
         $this->setPackage('Thelia.Model');
-        $this->setUseIdGenerator(true);
+        $this->setUseIdGenerator(false);
         $this->setIsCrossRef(true);
         // columns
-        $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
         $this->addForeignPrimaryKey('PROFILE_ID', 'ProfileId', 'INTEGER' , 'profile', 'ID', true, null, null);
         $this->addForeignPrimaryKey('RESOURCE_ID', 'ResourceId', 'INTEGER' , 'resource', 'ID', true, null, null);
         $this->addColumn('ACCESS', 'Access', 'INTEGER', true, null, 0);
@@ -196,7 +190,7 @@ class ProfileResourceTableMap extends TableMap
     {
         if (Propel::isInstancePoolingEnabled()) {
             if (null === $key) {
-                $key = serialize(array((string) $obj->getId(), (string) $obj->getProfileId(), (string) $obj->getResourceId()));
+                $key = serialize(array((string) $obj->getProfileId(), (string) $obj->getResourceId()));
             } // if key === null
             self::$instances[$key] = $obj;
         }
@@ -216,11 +210,11 @@ class ProfileResourceTableMap extends TableMap
     {
         if (Propel::isInstancePoolingEnabled() && null !== $value) {
             if (is_object($value) && $value instanceof \Thelia\Model\ProfileResource) {
-                $key = serialize(array((string) $value->getId(), (string) $value->getProfileId(), (string) $value->getResourceId()));
+                $key = serialize(array((string) $value->getProfileId(), (string) $value->getResourceId()));
 
-            } elseif (is_array($value) && count($value) === 3) {
+            } elseif (is_array($value) && count($value) === 2) {
                 // assume we've been passed a primary key";
-                $key = serialize(array((string) $value[0], (string) $value[1], (string) $value[2]));
+                $key = serialize(array((string) $value[0], (string) $value[1]));
             } elseif ($value instanceof Criteria) {
                 self::$instances = [];
 
@@ -248,11 +242,11 @@ class ProfileResourceTableMap extends TableMap
     public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
     {
         // If the PK cannot be derived from the row, return NULL.
-        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('ProfileId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('ResourceId', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('ProfileId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('ResourceId', TableMap::TYPE_PHPNAME, $indexType)] === null) {
             return null;
         }
 
-        return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('ProfileId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('ResourceId', TableMap::TYPE_PHPNAME, $indexType)]));
+        return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('ProfileId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('ResourceId', TableMap::TYPE_PHPNAME, $indexType)]));
     }
 
     /**
@@ -368,14 +362,12 @@ class ProfileResourceTableMap extends TableMap
     public static function addSelectColumns(Criteria $criteria, $alias = null)
     {
         if (null === $alias) {
-            $criteria->addSelectColumn(ProfileResourceTableMap::ID);
             $criteria->addSelectColumn(ProfileResourceTableMap::PROFILE_ID);
             $criteria->addSelectColumn(ProfileResourceTableMap::RESOURCE_ID);
             $criteria->addSelectColumn(ProfileResourceTableMap::ACCESS);
             $criteria->addSelectColumn(ProfileResourceTableMap::CREATED_AT);
             $criteria->addSelectColumn(ProfileResourceTableMap::UPDATED_AT);
         } else {
-            $criteria->addSelectColumn($alias . '.ID');
             $criteria->addSelectColumn($alias . '.PROFILE_ID');
             $criteria->addSelectColumn($alias . '.RESOURCE_ID');
             $criteria->addSelectColumn($alias . '.ACCESS');
@@ -439,9 +431,8 @@ class ProfileResourceTableMap extends TableMap
                 $values = array($values);
             }
             foreach ($values as $value) {
-                $criterion = $criteria->getNewCriterion(ProfileResourceTableMap::ID, $value[0]);
-                $criterion->addAnd($criteria->getNewCriterion(ProfileResourceTableMap::PROFILE_ID, $value[1]));
-                $criterion->addAnd($criteria->getNewCriterion(ProfileResourceTableMap::RESOURCE_ID, $value[2]));
+                $criterion = $criteria->getNewCriterion(ProfileResourceTableMap::PROFILE_ID, $value[0]);
+                $criterion->addAnd($criteria->getNewCriterion(ProfileResourceTableMap::RESOURCE_ID, $value[1]));
                 $criteria->addOr($criterion);
             }
         }
@@ -489,10 +480,6 @@ class ProfileResourceTableMap extends TableMap
             $criteria = $criteria->buildCriteria(); // build Criteria from ProfileResource object
         }
 
-        if ($criteria->containsKey(ProfileResourceTableMap::ID) && $criteria->keyContainsValue(ProfileResourceTableMap::ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.ProfileResourceTableMap::ID.')');
-        }
-
 
         // Set the correct dbName
         $query = ProfileResourceQuery::create()->mergeWith($criteria);

install/insert.sql

@@ -1197,29 +1197,29 @@ INSERT INTO `order_status_i18n` (`id`, `locale`, `title`, `description`, `chapo`
 generated with command : php Thelia thelia:generate-resources --output sql
  */
 INSERT INTO resource (`id`, `code`, `created_at`, `updated_at`) VALUES
-(NULL, 'admin.address', NOW(), NOW()),
-(NULL, 'admin.configuration.admin', NOW(), NOW()),
-(NULL, 'admin.configuration.area', NOW(), NOW()),
-(NULL, 'admin.configuration.attribute', NOW(), NOW()),
-(NULL, 'admin.category', NOW(), NOW()),
-(NULL, 'admin.configuration', NOW(), NOW()),
-(NULL, 'admin.content', NOW(), NOW()),
-(NULL, 'admin.configuration.country', NOW(), NOW()),
-(NULL, 'admin.coupon', NOW(), NOW()),
-(NULL, 'admin.configuration.currency', NOW(), NOW()),
-(NULL, 'admin.customer', NOW(), NOW()),
-(NULL, 'admin.configuration.feature', NOW(), NOW()),
-(NULL, 'admin.folder', NOW(), NOW()),
-(NULL, 'admin.configuration.language', NOW(), NOW()),
-(NULL, 'admin.configuration.mailing-system', NOW(), NOW()),
-(NULL, 'admin.configuration.message', NOW(), NOW()),
-(NULL, 'admin.configuration.module', NOW(), NOW()),
-(NULL, 'admin.order', NOW(), NOW()),
-(NULL, 'admin.product', NOW(), NOW()),
-(NULL, 'admin.configuration.profile', NOW(), NOW()),
-(NULL, 'admin.configuration.shipping-zone', NOW(), NOW()),
-(NULL, 'admin.configuration.tax', NOW(), NOW()),
-(NULL, 'admin.configuration.template', NOW(), NOW());
+(1, 'admin.address', NOW(), NOW()),
+(2, 'admin.configuration.admin', NOW(), NOW()),
+(3, 'admin.configuration.area', NOW(), NOW()),
+(4, 'admin.configuration.attribute', NOW(), NOW()),
+(5, 'admin.category', NOW(), NOW()),
+(6, 'admin.configuration', NOW(), NOW()),
+(7, 'admin.content', NOW(), NOW()),
+(8, 'admin.configuration.country', NOW(), NOW()),
+(9, 'admin.coupon', NOW(), NOW()),
+(10, 'admin.configuration.currency', NOW(), NOW()),
+(11, 'admin.customer', NOW(), NOW()),
+(12, 'admin.configuration.feature', NOW(), NOW()),
+(13, 'admin.folder', NOW(), NOW()),
+(14, 'admin.configuration.language', NOW(), NOW()),
+(15, 'admin.configuration.mailing-system', NOW(), NOW()),
+(16, 'admin.configuration.message', NOW(), NOW()),
+(17, 'admin.configuration.module', NOW(), NOW()),
+(18, 'admin.order', NOW(), NOW()),
+(19, 'admin.product', NOW(), NOW()),
+(20, 'admin.configuration.profile', NOW(), NOW()),
+(21, 'admin.configuration.shipping-zone', NOW(), NOW()),
+(22, 'admin.configuration.tax', NOW(), NOW()),
+(23, 'admin.configuration.template', NOW(), NOW());
 
 /**
 generated with command : php Thelia thelia:generate-resources --output sql-i18n

install/thelia.sql

@@ -999,14 +999,13 @@ DROP TABLE IF EXISTS `profile_resource`;
 
 CREATE TABLE `profile_resource`
 (
-    `id` INTEGER NOT NULL AUTO_INCREMENT,
     `profile_id` INTEGER NOT NULL,
     `resource_id` INTEGER NOT NULL,
     `access` INTEGER DEFAULT 0 NOT NULL,
     `created_at` DATETIME,
     `updated_at` DATETIME,
-    PRIMARY KEY (`id`,`profile_id`,`resource_id`),
-    INDEX `id_profile_resource_profile_id` (`profile_id`),
+    PRIMARY KEY (`profile_id`,`resource_id`),
+    INDEX `idx_profile_resource_profile_id` (`profile_id`),
     INDEX `idx_profile_resource_resource_id` (`resource_id`),
     CONSTRAINT `fk_profile_resource_profile_id`
         FOREIGN KEY (`profile_id`)
@@ -1028,13 +1027,12 @@ DROP TABLE IF EXISTS `profile_module`;
 
 CREATE TABLE `profile_module`
 (
-    `id` INTEGER NOT NULL AUTO_INCREMENT,
     `profile_id` INTEGER NOT NULL,
-    `module_id` INTEGER,
-    `access` TINYINT DEFAULT 0,
+    `module_id` INTEGER NOT NULL,
+    `access` INTEGER DEFAULT 0 NOT NULL,
     `created_at` DATETIME,
     `updated_at` DATETIME,
-    PRIMARY KEY (`id`),
+    PRIMARY KEY (`profile_id`,`module_id`),
     INDEX `idx_profile_module_profile_id` (`profile_id`),
     INDEX `idx_profile_module_module_id` (`module_id`),
     CONSTRAINT `fk_profile_module_profile_id`
@@ -1593,9 +1591,6 @@ CREATE TABLE `newsletter`
     `email` VARCHAR(255) NOT NULL,
     `firstname` VARCHAR(255),
     `lastname` VARCHAR(255),
-    `locale` VARCHAR(45),
-    `created_at` DATETIME,
-    `updated_at` DATETIME,
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB;
 

local/config/schema.xml

@@ -773,7 +773,6 @@
     <behavior name="timestampable" />
   </table>
   <table isCrossRef="true" name="profile_resource" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="profile_id" primaryKey="true" required="true" type="INTEGER" />
     <column name="resource_id" primaryKey="true" required="true" type="INTEGER" />
     <column defaultValue="0" name="access" required="true" type="INTEGER" />
@@ -783,7 +782,7 @@
     <foreign-key foreignTable="resource" name="fk_profile_resource_resource_id" onDelete="CASCADE" onUpdate="RESTRICT">
       <reference foreign="id" local="resource_id" />
     </foreign-key>
-    <index name="id_profile_resource_profile_id">
+    <index name="idx_profile_resource_profile_id">
       <index-column name="profile_id" />
     </index>
     <index name="idx_profile_resource_resource_id">
@@ -792,10 +791,9 @@
     <behavior name="timestampable" />
   </table>
   <table name="profile_module" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="profile_id" required="true" type="INTEGER" />
-    <column name="module_id" type="INTEGER" />
-    <column defaultValue="0" name="access" type="TINYINT" />
+    <column name="profile_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="module_id" primaryKey="true" required="true" type="INTEGER" />
+    <column defaultValue="0" name="access" required="true" type="INTEGER" />
     <foreign-key foreignTable="profile" name="fk_profile_module_profile_id" onDelete="CASCADE" onUpdate="CASCADE">
       <reference foreign="id" local="profile_id" />
     </foreign-key>
@@ -1245,12 +1243,10 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="newsletter" namespace="Thelia\Model">
+  <table name="newsletter">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="email" required="true" size="255" type="VARCHAR" />
     <column name="firstname" size="255" type="VARCHAR" />
     <column name="lastname" size="255" type="VARCHAR" />
-    <column name="locale" size="45" type="VARCHAR" />
-    <behavior name="timestampable" />
   </table>
 </database>

templates/admin/default/profile-edit.html

@@ -32,7 +32,8 @@
 
                 <ul class="nav nav-tabs clearfix">
                     <li {if $oder_tab == 'data'}class="active"{/if}><a href="#data" data-tab-name="cart" data-toggle="tab"><span class="glyphicon glyphicon-shopping-cart"></span> {intl l="Description"}</a></li>
-                    <li {if $oder_tab == 'permissions'}class="active"{/if}><a href="#permissions" data-tab-name="bill" data-toggle="tab"><span class="glyphicon glyphicon-list-alt"></span> {intl l="Permissions"}</a></li>
+                    <li {if $oder_tab == 'resources'}class="active"{/if}><a href="#resources" data-tab-name="bill" data-toggle="tab"><span class="glyphicon glyphicon-list-alt"></span> {intl l="Resource access rights"}</a></li>
+                    <li {if $oder_tab == 'modules'}class="active"{/if}><a href="#modules" data-tab-name="bill" data-toggle="tab"><span class="glyphicon glyphicon-list-alt"></span> {intl l="Module access rights"}</a></li>
                 </ul>
 
                 <div class="tab-content">
@@ -116,61 +117,167 @@
 
                     </div>
 
-                    <div class="tab-pane fade {if $oder_tab == 'permissions'}active in{/if}" id="permissions">
+                    <div class="tab-pane fade {if $oder_tab == 'resources'}active in{/if}" id="resources">
 
-                        <table class="table table-striped table-condensed table-left-aligned">
-                            <caption>
-                                {intl l="Manage permissions"}
-                            </caption>
-                            <thead>
-                            <tr>
-                                <th rowspan="2">{intl l="Resource"}</th>
-                                <th rowspan="2">{intl l="Title"}</th>
-                                <th colspan="4" class="text-center">{intl l="Rights"}</th>
-                            </tr>
-                            <tr>
-                                <th>{intl l="View"}</th>
-                                <th>{intl l="Create"}</th>
-                                <th>{intl l="Update"}</th>
-                                <th>{intl l="Delete"}</th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                                {loop type="resource" name="resource-list" profile=$ID backend_context="1"}
+                        {form name="thelia.admin.profile.resource-access.modification"}
+
+                        <form method="POST" action="{url path="/admin/configuration/profiles/saveResourceAccess?tab=resources"}" {form_enctype form=$form} >
+
+                            {form_hidden_fields form=$form}
+
+                            {* Be sure to get the product ID, even if the form could not be validated *}
+                            <input type="hidden" name="profile_id" value="{$ID}" />
+
+                            {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
+
+                            <table class="table table-striped table-condensed table-left-aligned">
+                                <caption>
+                                    {intl l="Manage resource rights"}
+                                    <button type="submit" class="btn btn-default btn-primary pull-right"><span class="glyphicon glyphicon-check"></span> {intl l="Save"}</button>
+                                </caption>
+                                <thead>
                                 <tr>
-                                    <td>{$CODE}</td>
-                                    <td>{$TITLE}</td>
-                                    <td>
-                                        <div class="make-switch switch-mini" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
-                                            <input type="checkbox" {if $VIEWABLE == 1}checked="checked"{/if}>
-                                        </div>
-                                    </td>
-                                    <td>
-                                        <div class="make-switch switch-mini" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
-                                            <input type="checkbox" {if $CREATABLE == 1}checked="checked"{/if}>
-                                        </div>
-                                    </td>
-                                    <td>
-                                        <div class="make-switch switch-mini" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
-                                            <input type="checkbox" {if $UPDATABLE == 1}checked="checked"{/if}>
-                                        </div>
-                                    </td>
-                                    <td>
-                                        <div class="make-switch switch-mini" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
-                                            <input type="checkbox" {if $DELETABLE == 1}checked="checked"{/if}>
-                                        </div>
+                                    <th rowspan="2">{intl l="Resource"}</th>
+                                    <th rowspan="2">{intl l="Title"}</th>
+                                    <th colspan="4" class="text-center">{intl l="Rights"}</th>
+                                </tr>
+                                <tr>
+                                    <th>{intl l="View"}</th>
+                                    <th>{intl l="Create"}</th>
+                                    <th>{intl l="Update"}</th>
+                                    <th>{intl l="Delete"}</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+
+                                    {form_tagged_fields form=$form tag='resources'}
+
+                                        {loop type="resource" name="resource-list" code=$attr_list.resource_code profile=$ID backend_context="1"}
+
+                                        <tr>
+                                            <td>{$CODE}</td>
+                                            <td>{$TITLE}</td>
+                                            <td>
+                                                <div class="make-switch switch-mini" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                                    <input name="{$name}" value="VIEW" type="checkbox" {if $VIEWABLE == 1}checked="checked"{/if}>
+                                                </div>
+                                            </td>
+                                            <td>
+                                                <div class="make-switch switch-mini" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                                    <input name="{$name}" value="CREATE" type="checkbox" {if $CREATABLE == 1}checked="checked"{/if}>
+                                                </div>
+                                            </td>
+                                            <td>
+                                                <div class="make-switch switch-mini" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                                    <input name="{$name}" value="UPDATE" type="checkbox" {if $UPDATABLE == 1}checked="checked"{/if}>
+                                                </div>
+                                            </td>
+                                            <td>
+                                                <div class="make-switch switch-mini" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                                    <input name="{$name}" value="DELETE" type="checkbox" {if $DELETABLE == 1}checked="checked"{/if}>
+                                                </div>
+                                            </td>
+                                        </tr>
+
+                                        {/loop}
+
+                                    {/form_tagged_fields}
+
+                                </tbody>
+                                <tfoot>
+                                <tr>
+                                    <td colspan="7">
+                                        <button type="submit" class="btn btn-default btn-primary pull-right"><span class="glyphicon glyphicon-check"></span> {intl l="Save"}</button>
                                     </td>
                                 </tr>
-                                {/loop}
-                            </tbody>
-                            <tfoot>
-                            <tr>
-                                <td colspan="3">
+                                </tfoot>
+                            </table>
+
+                        </form>
+
+                        {/form}
+
+                    </div>
+
+                    <div class="tab-pane fade {if $oder_tab == 'modules'}active in{/if}" id="modules">
+
+                        {form name="thelia.admin.profile.module-access.modification"}
+
+                        <form method="POST" action="{url path="/admin/configuration/profiles/saveModuleAccess?tab=modules"}" {form_enctype form=$form} >
+
+                            {form_hidden_fields form=$form}
+
+                            {* Be sure to get the product ID, even if the form could not be validated *}
+                            <input type="hidden" name="profile_id" value="{$ID}" />
+
+                            {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
+
+                            <table class="table table-striped table-condensed table-left-aligned">
+                                <caption>
+                                    {intl l="Manage module rights"}
                                     <button type="submit" class="btn btn-default btn-primary pull-right"><span class="glyphicon glyphicon-check"></span> {intl l="Save"}</button>
-                                </td>
-                            </tr>
-                            </tfoot>
-                        </table>
+                                </caption>
+                                <thead>
+                                <tr>
+                                    <th rowspan="2">{intl l="Module"}</th>
+                                    <th rowspan="2">{intl l="Title"}</th>
+                                    <th colspan="4" class="text-center">{intl l="Rights"}</th>
+                                </tr>
+                                <tr>
+                                    <th>{intl l="View"}</th>
+                                    <th>{intl l="Create"}</th>
+                                    <th>{intl l="Update"}</th>
+                                    <th>{intl l="Delete"}</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+
+                                    {form_tagged_fields form=$form tag='modules'}
+
+                                        {loop type="module" name="module-list" code=$attr_list.module_code profile=$ID backend_context="1"}
+
+                                        <tr>
+                                            <td>{$CODE}</td>
+                                            <td>{$TITLE}</td>
+                                            <td>
+                                                <div class="make-switch switch-mini" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                                    <input name="{$name}" value="VIEW" type="checkbox" {if $VIEWABLE == 1}checked="checked"{/if}>
+                                                </div>
+                                            </td>
+                                            <td>
+                                                <div class="make-switch switch-mini" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                                    <input name="{$name}" value="CREATE" type="checkbox" {if $CREATABLE == 1}checked="checked"{/if}>
+                                                </div>
+                                            </td>
+                                            <td>
+                                                <div class="make-switch switch-mini" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                                    <input name="{$name}" value="UPDATE" type="checkbox" {if $UPDATABLE == 1}checked="checked"{/if}>
+                                                </div>
+                                            </td>
+                                            <td>
+                                                <div class="make-switch switch-mini" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                                    <input name="{$name}" value="DELETE" type="checkbox" {if $DELETABLE == 1}checked="checked"{/if}>
+                                                </div>
+                                            </td>
+                                        </tr>
+
+                                        {/loop}
+
+                                    {/form_tagged_fields}
+
+                                </tbody>
+                                <tfoot>
+                                <tr>
+                                    <td colspan="7">
+                                        <button type="submit" class="btn btn-default btn-primary pull-right"><span class="glyphicon glyphicon-check"></span> {intl l="Save"}</button>
+                                    </td>
+                                </tr>
+                                </tfoot>
+                            </table>
+
+                        </form>
+
+                        {/form}
 
                     </div>