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

create test for UrlRewritingTrait

Browse Source
This commit is contained in:
Manuel Raynaud
2013-09-17 20:15:28 +02:00
parent e1e383707b
commit da7f9e07c4
3 changed files with 96 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/lib/Thelia/Model/RewritingUrl.php
View File

@@ -2,25 +2,25 @@
namespace Thelia\Model;
use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Connection\ConnectionInterface;
use Thelia\Model\Base\RewritingUrl as BaseRewritingUrl;
use Thelia\Model\RewritingUrlQuery;
class RewritingUrl extends BaseRewritingUrl {
public function preSave(ConnectionInterface $con = null)
public function postInsert(ConnectionInterface $con = null)
{
if($this->getRedirected() == 0) {
//check if rewriting url alredy exists and put redirect to 1
if(null !== $this->getRedirected()) {
//check if rewriting url alredy exists and put redirect to the new one
RewritingUrlQuery::create()
->filterByView($this->getView())
->filterByViewId($this->getViewId())
->filterByViewLocale($this->getViewLocale())
->filterByRedirected($this->getId(), Criteria::NOT_IN)
->update(array(
"redirect" => 1
"Redirected" => $this->getId()
));
}
return true;
}
}

9
core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
View File

@@ -55,17 +55,13 @@ trait UrlRewritingTrait {
public function generateRewrittenUrl($locale)
{
if ($this->isNew()) {
throw new \RuntimeException(sprintf('Object %s must be save before generating url', $this->getRewrittenUrlViewName()));
throw new \RuntimeException(sprintf('Object %s must be saved before generating url', $this->getRewrittenUrlViewName()));
}
// Borrowed from http://stackoverflow.com/questions/2668854/sanitizing-strings-to-make-them-url-and-filename-safe
$this->setLocale($locale);
$title = $this->getTitle();
if (null === $title) {
throw new \RuntimeException(sprintf('Impossible to generate url if title does not exists for the locale %s', $locale));
}
$title = $this->getTitle() ?: $this->getRef();
// Replace all weird characters with dashes
$string = preg_replace('/[^\w\-~_\.]+/u', '-', $title);
@@ -88,7 +84,6 @@ trait UrlRewritingTrait {
->setView($this->getRewrittenUrlViewName())
->setViewId($this->getId())
->setViewLocale($locale)
->setRedirected(0)
->save()
;
}