Commit b21367c5 authored by Ghislain Loas's avatar Ghislain Loas
Browse files

dev #48675 fix rt comments

parent 0be88de0
Pipeline #665 failed with stage
in 20 minutes and 6 seconds
......@@ -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
......@@ -20,7 +20,7 @@
*/
class ZendAfi_Form_SendMAil extends ZendAfi_Form {
class ZendAfi_Form_SendMail extends ZendAfi_Form {
public function init() {
parent::init();
......
......@@ -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,
......
......@@ -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']);
......
......@@ -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),
......
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment