From 60cb9cd52bcdeb85a1462d97ac670b72fc88e8c7 Mon Sep 17 00:00:00 2001 From: gmorel Date: Tue, 10 Dec 2013 11:00:55 +0100 Subject: [PATCH 1/4] =?UTF-8?q?Fix=20typo=20:=20attributes=20=3D=20d=C3=A9?= =?UTF-8?q?clinaisons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/backOffice/default/I18n/fr_FR.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/backOffice/default/I18n/fr_FR.php b/templates/backOffice/default/I18n/fr_FR.php index c0b2c7f07..72db631f2 100755 --- a/templates/backOffice/default/I18n/fr_FR.php +++ b/templates/backOffice/default/I18n/fr_FR.php @@ -622,7 +622,7 @@ return array( 'Product EAN Code' => 'Code EAN du produit', 'Product Features' => 'Caractéristiques du produit', 'Product accessories' => 'Accessoires du produit', - 'Product attributes' => 'Attributs produit', + 'Product attributes' => 'Déclinaisons 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 features' => 'Caractéristiques produit', From 83cac71895153d404667893711cc2ff7e9389460 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Tue, 10 Dec 2013 15:48:22 +0100 Subject: [PATCH 2/4] fix urls in loops --- core/lib/Thelia/Rewriting/RewritingRetriever.php | 4 +++- core/lib/Thelia/Tools/URL.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/lib/Thelia/Rewriting/RewritingRetriever.php b/core/lib/Thelia/Rewriting/RewritingRetriever.php index dfdbab05c..ce6ada8e7 100755 --- a/core/lib/Thelia/Rewriting/RewritingRetriever.php +++ b/core/lib/Thelia/Rewriting/RewritingRetriever.php @@ -71,7 +71,9 @@ class RewritingRetriever $this->rewrittenUrl = null; $this->url = URL::getInstance()->viewUrl($view, $allParametersWithoutView); if($this->search !== null) { - $this->rewrittenUrl = $this->search->getUrl(); + $this->rewrittenUrl = URL::getInstance()->absoluteUrl( + $this->search->getUrl() + ); } } diff --git a/core/lib/Thelia/Tools/URL.php b/core/lib/Thelia/Tools/URL.php index 85f5289cd..57fb9fa96 100755 --- a/core/lib/Thelia/Tools/URL.php +++ b/core/lib/Thelia/Tools/URL.php @@ -199,7 +199,7 @@ class URL public function retrieve($view, $viewId, $viewLocale) { if (ConfigQuery::isRewritingEnable()) { - URL::getInstance()->absoluteUrl($this->retriever->loadViewUrl($view, $viewLocale, $viewId)); + $this->retriever->loadViewUrl($view, $viewLocale, $viewId); } else { $allParametersWithoutView = array(); $allParametersWithoutView['locale'] = $viewLocale; From 63f48b79da75696dcb41650ea8b1765cfe9fdf4a Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Tue, 10 Dec 2013 15:56:59 +0100 Subject: [PATCH 3/4] fix rewrinting tests --- core/lib/Thelia/Tests/Rewriting/RewritingRetrieverTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/lib/Thelia/Tests/Rewriting/RewritingRetrieverTest.php b/core/lib/Thelia/Tests/Rewriting/RewritingRetrieverTest.php index 1a47dc10a..e237d65fb 100755 --- a/core/lib/Thelia/Tests/Rewriting/RewritingRetrieverTest.php +++ b/core/lib/Thelia/Tests/Rewriting/RewritingRetrieverTest.php @@ -101,7 +101,7 @@ class RewritingRetrieverTest extends \PHPUnit_Framework_TestCase $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); } From ff828bf1babd79fa6be6f2ccf1873fc983511334 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Wed, 11 Dec 2013 13:10:03 +0100 Subject: [PATCH 4/4] test rewritten url reassignment --- .../Thelia/Tests/Action/RewrittenUrlTestTrait.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php b/core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php index 567fbe3d9..3fef92565 100644 --- a/core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php +++ b/core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php @@ -3,6 +3,7 @@ namespace Thelia\Tests\Action; use Propel\Runtime\ActiveQuery\Criteria; use Thelia\Exception\UrlRewritingException; +use Thelia\Model\Base\ProductQuery; use Thelia\Model\Base\RewritingUrlQuery; use Thelia\Model\ConfigQuery; use Thelia\Rewriting\RewritingResolver; @@ -81,6 +82,17 @@ trait RewrittenUrlTestTrait $this->assertEquals($oldUrlEntry->getRedirected(), $newUrlEntry->getId()); /* 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); } } \ No newline at end of file