From b21367c5fed6ffe1dc20ca3262aeffc7814cef0d Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Mon, 6 Mar 2017 17:26:25 +0100
Subject: [PATCH] dev #48675 fix rt comments
---
.../modules/opac/controllers/AbonneController.php | 10 +++++-----
library/ZendAfi/Form/SendMail.php | 2 +-
library/ZendAfi/View/Helper/ModeleFusion/Link.php | 6 +++++-
library/ZendAfi/View/Helper/ModeleFusion/Template.php | 2 +-
library/ZendAfi/View/Helper/Search/Header.php | 2 +-
library/ZendAfi/View/Helper/TagSendMail.php | 5 ++---
6 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/application/modules/opac/controllers/AbonneController.php b/application/modules/opac/controllers/AbonneController.php
index 18a95eff8a2..3bc9095d69b 100644
--- a/application/modules/opac/controllers/AbonneController.php
+++ b/application/modules/opac/controllers/AbonneController.php
@@ -1204,15 +1204,15 @@ class AbonneController extends ZendAfi_Controller_Action {
public function popupEmailAction() {
- $this->view->redirect = $this->_getParam('redirect');
+ $this->view->redirect = $redirect = $this->_getParam('redirect');
if(!$user = Class_Users::getIdentity())
- return $this->_forward('popup-login', 'auth', 'opac', $this->view->redirect);
+ return $this->_forward('popup-login', 'auth', 'opac', $redirect);
$this->view->form = $form = new ZendAfi_Form_User_Email();
$form->setAction($this->view->url(['controller' => 'abonne',
'action' => 'popup-email',
- 'redirect' => $this->view->redirect],
+ 'redirect' => $redirect],
null,
true));
@@ -1221,9 +1221,9 @@ class AbonneController extends ZendAfi_Controller_Action {
$user->setMail($this->_getParam('email'))->save();
if($user->hasMail())
- return $this->_redirect($this->view->redirect);
+ return $this->_redirect($redirect);
- $this->renderPopupResult($this->view->_('Compléter votre adresse email'),
+ $this->renderPopupResult($this->_('Compléter votre adresse email'),
$this->view->render('abonne/ajax-email.phtml'));
}
}
\ No newline at end of file
diff --git a/library/ZendAfi/Form/SendMail.php b/library/ZendAfi/Form/SendMail.php
index 6f13a9e3759..dc16abd4971 100644
--- a/library/ZendAfi/Form/SendMail.php
+++ b/library/ZendAfi/Form/SendMail.php
@@ -20,7 +20,7 @@
*/
-class ZendAfi_Form_SendMAil extends ZendAfi_Form {
+class ZendAfi_Form_SendMail extends ZendAfi_Form {
public function init() {
parent::init();
diff --git a/library/ZendAfi/View/Helper/ModeleFusion/Link.php b/library/ZendAfi/View/Helper/ModeleFusion/Link.php
index 964aaead00d..c48e55fddd1 100644
--- a/library/ZendAfi/View/Helper/ModeleFusion/Link.php
+++ b/library/ZendAfi/View/Helper/ModeleFusion/Link.php
@@ -33,13 +33,17 @@ class ZendAfi_View_Helper_ModeleFusion_Link extends ZendAfi_View_Helper_BaseHel
: Class_ModeleFusion::getFusionForStrategy($instance->getStrategy())))
return '';
+ $models = $instance->getModels();
+ if(!is_array($models))
+ return '';
+
$ids = $this->_getIds($instance->getIds()
? $instance->getIds()
: array_map(
function($model) {
return $model->getId();
},
- $instance->getModels()));
+ $models));
return $this->view->tagAnchor($this->view->url(['action' => $instance->getAction(),
'ids' => $ids,
diff --git a/library/ZendAfi/View/Helper/ModeleFusion/Template.php b/library/ZendAfi/View/Helper/ModeleFusion/Template.php
index 02eb24d93b7..6512062f588 100644
--- a/library/ZendAfi/View/Helper/ModeleFusion/Template.php
+++ b/library/ZendAfi/View/Helper/ModeleFusion/Template.php
@@ -27,7 +27,7 @@ class ZendAfi_View_Helper_ModeleFusion_Template extends ZendAfi_View_Helper_Base
protected function _getHeader() {
- return $this->_tag('meta', '',
+ return $this->_tag('meta', null,
['http-equiv' => 'Content-Type',
'content' => 'text/html',
'charset' => 'utf-8']);
diff --git a/library/ZendAfi/View/Helper/Search/Header.php b/library/ZendAfi/View/Helper/Search/Header.php
index 41b4156e0c5..9af60ff5a6c 100644
--- a/library/ZendAfi/View/Helper/Search/Header.php
+++ b/library/ZendAfi/View/Helper/Search/Header.php
@@ -78,7 +78,7 @@ class ZendAfi_View_Helper_Search_Header extends ZendAfi_View_Helper_BaseHelper {
->setSubject(strip_tags($this->view->tagSearchTerm($this->_criteria)))
->setModels($this->_search_result->fetchRecords())
->setIds(implode(';', array_slice($this->_search_result->fetchAllRecordsIds(), 0, 200)))
- ->setStrategy('Notice_List');
+ ->setStrategy(Class_ModeleFusion::RECORD_TEMPLATE);
$actions = [$this->_tag('span',
$this->view->tagAnchor($this->view->url($this->_criteria->getUrlRetourRechercheInitiale(), null, true),
diff --git a/library/ZendAfi/View/Helper/TagSendMail.php b/library/ZendAfi/View/Helper/TagSendMail.php
index 791a6d2b979..c3cc8a4c220 100644
--- a/library/ZendAfi/View/Helper/TagSendMail.php
+++ b/library/ZendAfi/View/Helper/TagSendMail.php
@@ -20,15 +20,14 @@
*/
-class ZendAfi_View_Helper_TagSendMail extends ZendAfi_View_Helper_ModeleFusion_Link {
-
+class ZendAfi_View_Helper_TagSendMail extends ZendAfi_View_Helper_BaseHelper {
public function tagSendMail($instance) {
$instance
->setAction('send-mail')
->setLink($this->_('Partager par email'))
->setAttribs(['data-popup' => 'true']);
- return $this->ModeleFusion_Link($instance);
+ return $this->view->ModeleFusion_Link($instance);
}
}
?>
\ No newline at end of file
--
GitLab