hotline#61462 fix hold item while not logged

library/ZendAfi/Controller/Action.php

@@ -175,6 +175,9 @@ class ZendAfi_Controller_Action extends Zend_Controller_Action {
 
 
   public function renderPopup($popup_url, $location = null) {
+    if ($this->isPopupRequest())
+      return $this->_redirect($popup_url);
+
     $this->getHelper('flashMessenger')
          ->addMessage([ZendAfi_Controller_Action_Helper_FlashMessenger::POPUP => ['url' => $popup_url]]);
 

library/ZendAfi/Form/Decorator/DisplayMode.php

@@ -24,11 +24,7 @@ class ZendAfi_Form_Decorator_DisplayMode extends Zend_Form_Decorator_Abstract {
   public function render($content) {
     $view = $this->_element->getView();
 
-    $submit_script = sprintf('$("select[name=\'%s\']").change(function() {$("#styles_reload").val("1");var form=$(this).closest("form"); %s form.submit();});',
-                             'mode-affichage',
-                             $view->isPopup()
-                             ? 'initializeAjaxFormSubmit(form);'
-                             : '');
+    $submit_script = '$("select[name=\'mode-affichage\']").change(function() {$("#styles_reload").val("1");var form=$(this).closest("form"); form.submit();});';
 
     Class_ScriptLoader::getInstance()
       ->addJQueryReady($submit_script);

library/ZendAfi/View/Helper/Admin/ImageViewersOptions.php

@@ -64,9 +64,7 @@ class ZendAfi_View_Helper_Admin_ImageViewersOptions
 
 
   protected function _getComboStyles() {
-    $submit_script = sprintf('$("select[name=\'style_liste\']").change(function() {$("#styles_reload").val("1");var form=$(this).closest("form"); %s form.submit();});',
-
-                             $this->view->isPopup() ? 'initializeAjaxFormSubmit(form);' : '');
+    $submit_script = '$("select[name=\'style_liste\']").change(function() {$("#styles_reload").val("1");var form=$(this).closest("form"); form.submit();});';
     Class_ScriptLoader::getInstance()
       ->addJQueryReady($submit_script);
 

library/ZendAfi/View/Helper/Bouton.php

@@ -74,8 +74,6 @@ class ZendAfi_View_Helper_Bouton extends ZendAfi_View_Helper_BaseHelper {
               $largeur="120px";
 
             $onclick = 'var form=$(this).parents(\'form\'); if (!form.size()) form=$(this).parents(\'.boutons\').prevAll(\'form\');if (!form.size()) form=$(this).parents(\'.boutons\').nextAll(\'form\');';
-            if ($this->_render_popup)
-              $onclick .= 'initializeAjaxFormSubmit(form);';
             $onclick .= 'form.submit(); return false;';
           }
       }

library/ZendAfi/View/Helper/Button/Submit.php

@@ -32,20 +32,13 @@ class ZendAfi_View_Helper_Button_Submit extends ZendAfi_View_Helper_BaseHelper {
 
 
   protected function _getDefaultAttribs() {
-    return ['onclick' => sprintf("var form=$(this).parents('form'); if (!form.size()) form=$(this).parents('.boutons, .admin-buttons').prevAll('form');if (!form.size()) form=$(this).parents('.boutons, .admin-buttons').nextAll('form');%sform.submit(); return false;", $this->_getAjax()),
+    return ['onclick' => "var form=$(this).parents('form'); if (!form.size()) form=$(this).parents('.boutons, .admin-buttons').prevAll('form');if (!form.size()) form=$(this).parents('.boutons, .admin-buttons').nextAll('form');form.submit(); return false;",
             'class' => 'bouton validate',
             'type' => 'submit',
             'title' => $this->_('Enregistrer mes modifications')];
   }
 
 
-  protected function _getAjax() {
-    return $this->view->isPopup()
-      ? 'initializeAjaxFormSubmit(form);'
-      : '';
-  }
-
-
   protected function _getDefaultButton($attribs) {
     return (new Class_Entity())
       ->setText($this->_('Valider'))

library/ZendAfi/View/Helper/FormSubmit.php

@@ -34,7 +34,6 @@ class ZendAfi_View_Helper_FormSubmit extends Zend_View_Helper_FormSubmit {
   public function formSubmit($name, $value = null, $attribs = []) {
     if ($this->_render_popup) {
       $onclick = 'var form=$(this).parents(\'form\'); if (!form.size()) form=$(this).parents(\'.boutons\').prevAll(\'form\');';
-      $onclick .= 'initializeAjaxFormSubmit(form);';
       $onclick .= 'form.submit(); return false;';
       $attribs['onclick'] = $onclick;
     }

library/ZendAfi/View/Helper/RenderForm.php

@@ -104,11 +104,8 @@ class ZendAfi_View_Helper_RenderForm extends ZendAfi_View_Helper_BaseHelper {
 
   protected function _injectOnKeyPressSubmit($element) {
     $element->onkeypress = 'if (event.keyCode == 13) {'
-      . ($this->view->isPopup()
-         ? 'initializeAjaxFormSubmit($(this.form));'
-         : '')
       . '$(this.form).submit();'
-      . 'return false;}';
+      . 'return false; }';
   }
 
 

library/ZendAfi/View/Helper/TagObjetsImgProperties.php

@@ -65,8 +65,7 @@ class ZendAfi_View_Helper_TagObjetsImgProperties
 
 
   private function getComboStyles($styles, $valeur_select) {
-        $submit_script = sprintf('$("select[name=\'style_liste\']").change(function() {$("#styles_reload").val("1");var form=$(this).closest("form"); %s form.submit();});',
-                             $this->view->isPopup() ? 'initializeAjaxFormSubmit(form);' : '');
+        $submit_script = '$("select[name=\'style_liste\']").change(function() {$("#styles_reload").val("1");var form=$(this).closest("form"); form.submit();});';
 
     Class_ScriptLoader::getInstance()
       ->addJQueryReady($submit_script);

public/opac/js/subModal.js

@@ -16,6 +16,7 @@
         opacDialogFromUrl(addPath(url, '/render/popup'));
       });
     current_anchor = undefined;
+    initializeAjaxFormSubmit($('#opac-dialog form'));
   }
 
 
@@ -28,7 +29,6 @@
 
 
   window.initializeAjaxFormSubmit = function(form) {
-
     form.submit(function(event) {
       updateAndDestroyCKEditor();
       formData = new FormData(form[0]);

tests/application/modules/opac/controllers/AuthControllerTest.php

@@ -1039,6 +1039,38 @@ class AuthControllerAjaxLoginPostTest extends AuthControllerPostSimpleSuccessful
 
 
 
+class AuthControllerAjaxLoginWithRedirectPopupPostTest extends AuthControllerPostSimpleSuccessfulTestCase {
+  public function setUp() {
+    parent::setUp();
+    $_SERVER['HTTP_REFERER'] = '/recherche/viewnotice';
+    $this->postDispatch('/opac/auth/ajax-login/render/popup',
+                        ['username' => 'foo',
+                         'password' => 'bar',
+                         'redirect' => '/recherche/simple/reservation-pickup-ajax/id/2'],
+                        true);
+  }
+
+
+  /** @test */
+  public function flashMessengerShouldContainsPopupForReservationPickup() {
+    $this->assertFlashMessengerContainsPopup(Class_Url::absolute('/recherche/simple/reservation-pickup-ajax/id/2/render/popup'));
+  }
+
+
+  /** @test */
+  public function responseShouldAjaxReloadPage() {
+    $this->assertXPathContentContains('//script', 'location.reload()');
+  }
+
+
+  /** @test */
+  public function responseShouldNotBeARedirect() {
+    $this->assertNotRedirect();
+  }
+}
+
+
+
 class AuthControllerBoiteLoginPostTest extends AuthControllerPostSimpleSuccessfulTestCase {
   public function setUp() {
     parent::setUp();