Merge branch 'hotline#40594_voiron_pb_sur_les_pages_suite_dupplication_de_profils' into 'stable'

Hotline#40594 voiron pb sur les pages suite dupplication de profils

See merge request !1582

VERSIONS_HOTLINE/40594

+ - ticket #40594 : Ajout de boîtes en front-office : correction d'un bug d'ajout ou suppression de la boite dans un autre profil que celui visualisé
\ No newline at end of file

library/ZendAfi/View/Helper/FonctionsAdmin.php

@@ -84,7 +84,8 @@ class ZendAfi_View_Helper_FonctionsAdmin extends ZendAfi_View_Helper_BaseHelper
                              'controller' => 'accueil',
                              'action' => 'add-block',
                              'id_module' => $this->id_module,
-                             'division' => $this->division],
+                             'division' => $this->division,
+                             'id_profil' => $this->id_profil],
                             null, true);
 
     $onclick = "showPopWin('" . htmlspecialchars($url) . "',800, 600, null)";
@@ -105,7 +106,8 @@ class ZendAfi_View_Helper_FonctionsAdmin extends ZendAfi_View_Helper_BaseHelper
                              'controller' => 'accueil',
                              'action' => 'delete-block',
                              'id_module' => $this->id_module,
-                             'division' => $this->division],
+                             'division' => $this->division,
+                             'id_profil' => $this->id_profil],
                             null, true);
 
     $onclick = "return confirm('". htmlspecialchars($this->_('Êtes-vous sur de vouloir supprimer cette boîte ?')) . "');";

tests/library/ZendAfi/View/Helper/Accueil/RechSimpleTest.php

@@ -65,13 +65,13 @@ class ZendAfi_View_Helper_Accueil_RechSimpleWithAdminTest extends ZendAfi_View_H
 
   /** @test */
   public function addBlockActionShouldBePresent() {
-    $this->assertLocalXPath('//img[contains(@onclick, "/admin/accueil/add-block/id_module/1/division/1")]');
+    $this->assertLocalXPath('//img[contains(@onclick, "/admin/accueil/add-block/id_module/1/division/1/id_profil/2")]');
   }
 
 
   /** @test */
   public function deleteBlockActionShouldBePresent() {
-    $this->assertLocalXPath('//a[contains(@href, "/admin/accueil/delete-block/id_module/1/division/1")][contains(@onclick, "return confirm(")]');
+    $this->assertLocalXPath('//a[contains(@href, "/admin/accueil/delete-block/id_module/1/division/1/id_profil/2")][contains(@onclick, "return confirm(")]');
   }
 }