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

Merge branch 'master' into frontend

Browse Source
This commit is contained in:
touffies
2013-12-11 18:54:50 +01:00
parent eae8ffe764 ff828bf1ba
commit 7eca83889a
5 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Rewriting/RewritingRetriever.php
View File

@@ -71,7 +71,9 @@ class RewritingRetriever
$this->rewrittenUrl = null; $this->rewrittenUrl = null;
$this->url = URL::getInstance()->viewUrl($view, $allParametersWithoutView); $this->url = URL::getInstance()->viewUrl($view, $allParametersWithoutView);
if($this->search !== null) { if($this->search !== null) {
$this->rewrittenUrl = $this->search->getUrl(); $this->rewrittenUrl = URL::getInstance()->absoluteUrl(
$this->search->getUrl()
);
} }
} }

14
core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php
View File

@@ -3,6 +3,7 @@ namespace Thelia\Tests\Action;
use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\ActiveQuery\Criteria;
use Thelia\Exception\UrlRewritingException; use Thelia\Exception\UrlRewritingException;
use Thelia\Model\Base\ProductQuery;
use Thelia\Model\Base\RewritingUrlQuery; use Thelia\Model\Base\RewritingUrlQuery;
use Thelia\Model\ConfigQuery; use Thelia\Model\ConfigQuery;
use Thelia\Rewriting\RewritingResolver; use Thelia\Rewriting\RewritingResolver;
@@ -81,6 +82,17 @@ trait RewrittenUrlTestTrait
$this->assertEquals($oldUrlEntry->getRedirected(), $newUrlEntry->getId()); $this->assertEquals($oldUrlEntry->getRedirected(), $newUrlEntry->getId());
/* we can reassign old Url to another object */ /* we can reassign old Url to another object */
//@todo $aRandomProduct = ProductQuery::create()
->filterById($object->getId(), Criteria::NOT_EQUAL)
->findOne();
$failReassign = true;
try {
$aRandomProduct->setRewrittenUrl($aRandomProduct->getLocale(), $currentUrl);
$failReassign = false;
} catch(\Exception $e) {
}
$this->assertFalse($failReassign);
} }
} }

2
core/lib/Thelia/Tests/Rewriting/RewritingRetrieverTest.php
View File

@@ -101,7 +101,7 @@ class RewritingRetrieverTest extends \PHPUnit_Framework_TestCase
$retriever->loadViewUrl('view', 'fr_FR', 1); $retriever->loadViewUrl('view', 'fr_FR', 1);
$this->assertEquals('foo.html', $retriever->rewrittenUrl); $this->assertEquals(URL::getInstance()->absoluteUrl('foo.html'), $retriever->rewrittenUrl);
$this->assertEquals(URL::getInstance()->viewUrl('view', array('locale' => 'fr_FR', 'view_id' => 1)), $retriever->url); $this->assertEquals(URL::getInstance()->viewUrl('view', array('locale' => 'fr_FR', 'view_id' => 1)), $retriever->url);
} }

2
core/lib/Thelia/Tools/URL.php
View File

@@ -199,7 +199,7 @@ class URL
public function retrieve($view, $viewId, $viewLocale) public function retrieve($view, $viewId, $viewLocale)
{ {
if (ConfigQuery::isRewritingEnable()) { if (ConfigQuery::isRewritingEnable()) {
URL::getInstance()->absoluteUrl($this->retriever->loadViewUrl($view, $viewLocale, $viewId)); $this->retriever->loadViewUrl($view, $viewLocale, $viewId);
} else { } else {
$allParametersWithoutView = array(); $allParametersWithoutView = array();
$allParametersWithoutView['locale'] = $viewLocale; $allParametersWithoutView['locale'] = $viewLocale;

2
templates/backOffice/default/I18n/fr_FR.php
View File

@@ -622,7 +622,7 @@ return array(
'Product EAN Code' => 'Code EAN du produit', 'Product EAN Code' => 'Code EAN du produit',
'Product Features' => 'Caractéristiques du produit', 'Product Features' => 'Caractéristiques du produit',
'Product accessories' => 'Accessoires du produit', 'Product accessories' => 'Accessoires du produit',
'Product attributes' => 'Attributs produit', 'Product attributes' => 'Déclinaisons produit',
'Product catalog configuration' => 'Configuration du catalogue produit', 'Product catalog configuration' => 'Configuration du catalogue produit',
'Product created on %date_create. Last modification: %date_change' => 'Produit créé le %date_create. Dernière modification le %date_change', 'Product created on %date_create. Last modification: %date_change' => 'Produit créé le %date_create. Dernière modification le %date_change',
'Product features' => 'Caractéristiques produit', 'Product features' => 'Caractéristiques produit',