diff --git a/VERSIONS_HOTLINE/158491 b/VERSIONS_HOTLINE/158491 new file mode 100644 index 0000000000000000000000000000000000000000..ee5d7f01d4f4eb32b60b0e20394eaa29720de13b --- /dev/null +++ b/VERSIONS_HOTLINE/158491 @@ -0,0 +1 @@ + - correctif #158491 : Magasin de thèmes : Correction des liens de modifications des menus en interface publique. \ No newline at end of file diff --git a/library/templates/Intonation/Library/Widget/Carousel/Menu/View.php b/library/templates/Intonation/Library/Widget/Carousel/Menu/View.php index b5c3eb4881ec1804cc4cda4a41da12e9cc934349..c1092c321b137eb94f45e6a40eccbb08b8dd5dd9 100644 --- a/library/templates/Intonation/Library/Widget/Carousel/Menu/View.php +++ b/library/templates/Intonation/Library/Widget/Carousel/Menu/View.php @@ -43,9 +43,7 @@ class Intonation_Library_Widget_Carousel_Menu_View extends Intonation_Library_Wi return null; return $this->_menu_cache = - $menu - ->setParent($this->getId()) - ->setParentInstance($this); + $menu->setParentInstance($this); } diff --git a/tests/scenarios/Templates/ChiliTest.php b/tests/scenarios/Templates/ChiliTest.php index 8e1eeff9e7dc0941cee19b2ccfe5fcc8f5d1ee8c..382cb70bfb6ee60be566e76433fa2be7deee9f07 100644 --- a/tests/scenarios/Templates/ChiliTest.php +++ b/tests/scenarios/Templates/ChiliTest.php @@ -149,6 +149,12 @@ class ChiliTemplateProfilePatcherTest extends ChiliTemplateTestCase { $this->assertXPath('//div[contains(@class, "top_highlight_carousel")]', $this->_response->getBody()); } + + + /** @test */ + public function editNavMenuLinkShouldNotHaveParentParam() { + $this->assertXPath('//div//nav/following-sibling::div[@class="configuration_module"]//a[@href= "/admin/widget/edit-menu/id/0/id_profil/1?backUrl=%2F"]'); + } } diff --git a/tests/scenarios/Templates/TemplatesTest.php b/tests/scenarios/Templates/TemplatesTest.php index 55c237cefa1aaab7b5245ea357223895b1df5397..08fe6920546559763d55e10875f021107898424b 100644 --- a/tests/scenarios/Templates/TemplatesTest.php +++ b/tests/scenarios/Templates/TemplatesTest.php @@ -2164,7 +2164,7 @@ class TemplateIntonationWithSkinTest extends TemplatesEnabledTestCase { /** @test */ public function editMenuLinkProfileIdShouldBe72() { - $this->assertXPath('//a[contains(@href, "/admin/widget/edit-menu/id/0/id_profil/72")]'); + $this->assertXPath('//a[@href= "/admin/widget/edit-menu/id/0/id_profil/72/parent/0?backUrl=%2Findex%2Findex%2Fid_profil%2F72"]'); } diff --git a/tests/scenarios/Widgets/WidgetsTest.php b/tests/scenarios/Widgets/WidgetsTest.php index 1cd9b9ae140b375280a156c57de3174ecd7d4bff..c696292a2b6d5aa377d58681c6d27ce6e96d8082 100644 --- a/tests/scenarios/Widgets/WidgetsTest.php +++ b/tests/scenarios/Widgets/WidgetsTest.php @@ -91,7 +91,7 @@ class WidgetsNavEditLinkInFrontTest extends WidgetsNavSimpleTestCase { /** @test */ public function linkToEditNavShouldBePopupReady() { - $this->assertXPath('//div[@id="menu_horizontal"]//a[contains(@href, "/admin/widget/edit-menu/id/H/id_profil/2")][@data-popup="true"]'); + $this->assertXPath('//div[@id="menu_horizontal"]//a[@href= "/admin/widget/edit-menu/id/2/id_profil/2/parent/H?backUrl=%2F"][@data-popup="true"]'); }