SD-30+SD-33

This commit is contained in:
Claire DELBOS 2017-04-07 11:20:55 +02:00
parent d1d3448e2d
commit b63addf2a4
2 changed files with 7 additions and 3 deletions

View File

@ -118,6 +118,7 @@ class SurveillanceController extends Zend_Controller_Action
$page = $request->getParam('page');
$from = $request->getParam('from');
$q = $request->getParam('q');
$siret = $request->getParam('siret', '');
$email = $request->getParam('email', '');
@ -136,6 +137,8 @@ class SurveillanceController extends Zend_Controller_Action
}
} elseif (isset($page)) {
$this->redirect('surveillance/liste/page/'.$page);
} elseif (isset($q)) {
$this->redirect('surveillance/liste/q/'.$q);
} else {
$this->redirect('surveillance/liste');
}
@ -424,8 +427,8 @@ class SurveillanceController extends Zend_Controller_Action
$pageTotal = $pageCurrent = 1;
}
$this->view->assign('PageTotal', $pageTotal);
$this->view->assign('PagePrev', $pagePrev);
$this->view->assign('PageNext', $pageNext);
$this->view->assign('PagePrev', isset($pagePrev)?$pagePrev:1);
$this->view->assign('PageNext', isset($pageNext)?$pageNext:1);
$this->view->assign('PageCurrent', $pageCurrent);
$this->view->assign('nbReponses', empty($nbReponses) ? 0 : $nbReponses);

View File

@ -152,7 +152,8 @@ par
'siret' => $item['siren'].$item['nic'],
'ref' => urlencode($surveillance['ref']),
'email' => $surveillance['email'],
'source' => $surveillance['source']
'source' => $surveillance['source'],
'q' => $this->q,
))?>" title="Supprimer la surveillance <?=$surveillance['source']?>">
<img src="/themes/default/images/interfaces/supprimer.png"/>
</a>