TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/thelia/thelia

Browse Source 
Conflicts:
	templates/admin/default/currencies.html
This commit is contained in:
franck
2013-09-05 23:30:50 +02:00
parent c276ab236e baa1df6d59
commit 318fb3bf2d
15 changed files with 167 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/lib/Thelia/Model/Tools/PositionManagementTrait.php
View File

@@ -49,15 +49,15 @@ trait PositionManagementTrait {
/**
* Get the position of the next inserted object
*/
public function getNextPosition($parent) {
public function getNextPosition($parent = null) {
$last = $this->createQuery()
$query = $this->createQuery()
->orderByPosition(Criteria::DESC)
->limit(1);
if ($parent !== null) $last->filterByParent($parent);
$last->findOne()
$last = $query->findOne()
;
return $last != null ? $last->getPosition() + 1 : 1;
@@ -107,11 +107,7 @@ trait PositionManagementTrait {
// If we found the proper object, exchange their positions
if ($result) {
// Find DATABASE_NAME constant
$mapClassName = self::TABLE_MAP;
$database_name = $mapClassName::DATABASE_NAME;
$cnx = Propel::getWriteConnection($database_name);
$cnx = Propel::getWriteConnection($this->getDatabaseName());
$cnx->beginTransaction();
@@ -130,6 +126,16 @@ trait PositionManagementTrait {
}
}
/**
* Simply return the database name, from the constant in the MAP class.
*/
protected function getDatabaseName() {
// Find DATABASE_NAME constant
$mapClassName = self::TABLE_MAP;
return $mapClassName::DATABASE_NAME;
}
/**
* Changes object position
*
@@ -161,7 +167,7 @@ trait PositionManagementTrait {
$results = $search->find();
$cnx = Propel::getWriteConnection(CategoryTableMap::DATABASE_NAME);
$cnx = Propel::getWriteConnection($this->getDatabaseName());
$cnx->beginTransaction();