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

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

Browse Source
This commit is contained in:
Etienne Roudeix
2013-09-17 20:33:08 +02:00
parent 294c48f8ab 7c340303f6
commit c659bc0e66
9 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Controller/Admin/CategoryController.php
View File

@@ -133,7 +133,7 @@ class CategoryController extends AbstractCrudController
'description' => $object->getDescription(),
'postscriptum' => $object->getPostscriptum(),
'visible' => $object->getVisible(),
'url' => $object->getRewritenUrl($this->getCurrentEditionLocale()),
'url' => $object->getRewrittenUrl($this->getCurrentEditionLocale()),
'parent' => $object->getParent()
);

2
core/lib/Thelia/Controller/Admin/ProductController.php
View File

@@ -141,7 +141,7 @@ class ProductController extends AbstractCrudController
'description' => $object->getDescription(),
'postscriptum' => $object->getPostscriptum(),
'visible' => $object->getVisible(),
'url' => $object->getRewritenUrl($this->getCurrentEditionLocale()),
'url' => $object->getRewrittenUrl($this->getCurrentEditionLocale()),
'parent' => $object->getParent()
);

1
core/lib/Thelia/Model/Category.php
View File

@@ -79,7 +79,6 @@ class Category extends BaseCategory
*/
public function postInsert(ConnectionInterface $con = null)
{
//$this->generateRewrittenUrl($this->getLocale());
$this->dispatchEvent(TheliaEvents::AFTER_CREATECATEGORY, new CategoryEvent($this));
}

5
core/lib/Thelia/Model/Content.php
View File

@@ -39,9 +39,4 @@ class Content extends BaseContent
return true;
}
public function postInsert(ConnectionInterface $con = null)
{
//$this->generateRewrittenUrl($this->getLocale());
}
}

5
core/lib/Thelia/Model/Folder.php
View File

@@ -70,9 +70,4 @@ class Folder extends BaseFolder
return true;
}
public function postInsert(ConnectionInterface $con = null)
{
//$this->generateRewrittenUrl($this->getLocale());
}
}

6
core/lib/Thelia/Model/FolderI18n.php
View File

@@ -2,8 +2,14 @@
namespace Thelia\Model;
use Propel\Runtime\Connection\ConnectionInterface;
use Thelia\Model\Base\FolderI18n as BaseFolderI18n;
class FolderI18n extends BaseFolderI18n {
public function postInsert(ConnectionInterface $con = null)
{
$folder = $this->getFolder();
$folder->generateRewrittenUrl($this->getLocale());
}
}

1
core/lib/Thelia/Model/Product.php
View File

@@ -119,7 +119,6 @@ class Product extends BaseProduct
*/
public function postInsert(ConnectionInterface $con = null)
{
//$this->generateRewrittenUrl($this->getLocale());
$this->dispatchEvent(TheliaEvents::AFTER_CREATEPRODUCT, new ProductEvent($this));
}

6
core/lib/Thelia/Model/ProductI18n.php
View File

@@ -2,8 +2,14 @@
namespace Thelia\Model;
use Propel\Runtime\Connection\ConnectionInterface;
use Thelia\Model\Base\ProductI18n as BaseProductI18n;
class ProductI18n extends BaseProductI18n {
public function postInsert(ConnectionInterface $con = null)
{
$product = $this->getProduct();
$product->generateRewrittenUrl($this->getLocale());
}
}

1
core/lib/Thelia/Tests/Rewriting/ProductRewriteTest.php
View File

@@ -76,6 +76,7 @@ class ProductRewriteTest extends \PHPUnit_Framework_TestCase
}
/**
* @covers Thelia\Model\Tools\UrlRewritingTrait::generateRewrittenUrl
* @expectedException \RuntimeException
* @expectedExceptionMessage Object product must be saved before generating url
*/