Merge branch...

Merge branch 'hotline#190239_suppression_favoris_message_erreur_json_pas_de_script_pour_les_popup' into 'master'

[RTFix] hotline#190239 : fix render ajax instead of page

See merge request !4920

VERSIONS_HOTLINE/190239

+ - correctif #190239 : Suppression des favoris: message json au lieu de revenir sur la page
\ No newline at end of file

library/Class/Button.php

@@ -33,7 +33,6 @@ class Class_Button {
     $_disable_popup = false,
     $_attribs = [];
 
-
   public function getElement() {
     return $this->_element;
   }
@@ -68,6 +67,9 @@ class Class_Button {
 
 
   public function getUrl() {
+    if ($this->getDisablePopup())
+      $this->_url = str_replace('/render/popup', '', $this->_url);
+
     return $this->_url;
   }
 
@@ -147,7 +149,7 @@ class Class_Button {
   public function getAttrib($name, $default=null) {
     return $this->hasAttrib($name)
       ? $this->_attribs[$name]
-      : $default;
+    : $default;
   }
 
 

library/ZendAfi/View/Helper/Button.php

@@ -58,7 +58,7 @@ class ZendAfi_View_Helper_Button extends ZendAfi_View_Helper_BaseHelper {
 
     if (($url = $button->getUrl()) && is_string($url))
       $button->setAttrib('onclick', sprintf('window.location.href = \'%s\';',
-                                            $this->_escapeJsAttrib($button->getUrl())));
+                                            $this->_escapeJsAttrib($url)));
 
     return $this;
   }

tests/scenarios/Templates/TemplatesAbonneSelectionsTest.php

@@ -377,6 +377,27 @@ class TemplatesAbonneSelectionsSupprimerDeLaSelectionTest
 
 
 
+class TemplatesAbonneSelectionsSupprimerLaSelectionAjaxTest extends TemplatesAbonneSelectionsTestCase {
+
+  /** @test */
+  public function questionToDeleteShouldBePresent() {
+    $this->dispatch('/opac/abonne/supprimer-la-selection/selection_id/2/id_profil/72/render/popup');
+    $json = json_decode($this->_response->getBody(),true);
+    $this->assertContains('Oui',  $json['content']);
+    $this->assertNotContains('id_profil/72/render/popup/',  $json['content']);
+  }
+
+
+  /** @test */
+  public function selection2ShouldHaveBeenDeleted() {
+    $this->dispatch('/opac/abonne/supprimer-la-selection/selection_id/2/id_profil/72/delete/1/render/popup');
+    $this->assertNull(Class_PanierNotice::find(2));
+  }
+}
+
+
+
+
 class TemplatesAbonneSelectionsSupprimerLaSelectionTest extends TemplatesAbonneSelectionsTestCase {
 
   /** @test */