diff --git a/application/modules/opac/controllers/AuthController.php b/application/modules/opac/controllers/AuthController.php index fe65f7c06e1abfdbd5d921685e616eb15224ff87..7185667399dbc18fe721c0c844bba324dd9ee56e 100644 --- a/application/modules/opac/controllers/AuthController.php +++ b/application/modules/opac/controllers/AuthController.php @@ -43,7 +43,7 @@ class AuthController extends Zend_Controller_Action $f = new Zend_Filter_StripTags(); $username = $f->filter($this->_request->getPost('username')); $password = $f->filter($this->_request->getPost('password')); - xdebug_break(); + if (empty($username)) return $this->view->_('Entrez votre identifiant S.V.P.'); diff --git a/application/modules/opac/controllers/CasServerController.php b/application/modules/opac/controllers/CasServerController.php index a099cbd7d7181c195d9af4d64169d836b14c499a..5a737601036e4915d8121e92b58bc19862fc483f 100644 --- a/application/modules/opac/controllers/CasServerController.php +++ b/application/modules/opac/controllers/CasServerController.php @@ -36,7 +36,6 @@ class CasServerController extends Zend_Controller_Action { } function loginAction() { - xdebug_break(); $this->values=$this->_request->getParams(); $service = $this->_request->getParam('service'); @@ -134,7 +133,7 @@ class CasServerController extends Zend_Controller_Action { function validateAction() { $service=$this->_request->getParam('service'); $ticket=$this->_request->getParam('ticket'); - xdebug_break(); + if (strlen($ticket)<1 || strlen($service)<1) { return $this->returnFailureTicketResponse('INVALID_REQUEST'); } diff --git a/application/modules/opac/controllers/RechercheController.php b/application/modules/opac/controllers/RechercheController.php index b98c68254f465ae52c1d4acc84f2f868aca48254..f0f6a151a248b73bf72cd205e2bda3e760d4d5ba 100644 --- a/application/modules/opac/controllers/RechercheController.php +++ b/application/modules/opac/controllers/RechercheController.php @@ -86,7 +86,7 @@ class RechercheController extends Zend_Controller_Action public function simpleAction() { if ($this->view->statut == "saisie") { - $this->_forward('saisie'); + $this->_redirect('opac/recherche/saisie'); return; } diff --git a/library/Class/Systeme/ModulesAppli.php b/library/Class/Systeme/ModulesAppli.php index 640812083d93934614f591e1cdccbca6cc7e1b2f..f7ade2d8ee1d7656fde469f1d9dd967d500e52de 100644 --- a/library/Class/Systeme/ModulesAppli.php +++ b/library/Class/Systeme/ModulesAppli.php @@ -66,7 +66,7 @@ class Class_Systeme_ModulesAppli extends Class_Systeme_ModulesAbstract { 'resultat' => array('libelle' => 'Résultat', 'popup_width' => 710, 'popup_height' => 620), 'resultatsimple' => array('libelle' => 'Résultat', 'titre' => 'test', 'popup_width' => 710, 'popup_height' => 620), 'viewnotice' => array('libelle' => 'Notice', 'popup_width' => 700, 'popup_height' => 720), - 'saisie' => array('libelle' => 'Nouvelle recherchere', 'popup_width' => 500, 'popup_height' => 300)), + 'saisie' => array('libelle' => 'Nouvelle recherchere', 'popup_width' => 800, 'popup_height' => 400)), 'noticeajax' => array( '*' => array('libelle' => 'Notice', 'popup_width' => 500, 'popup_height' => 300), @@ -271,7 +271,8 @@ class Class_Systeme_ModulesAppli extends Class_Systeme_ModulesAbstract { case "saisie"; $ret = array_merge((new Class_Systeme_ModulesAccueil_RechercheSimple())->getDefaultValues(), - ['type_doc' => 1]); + ['select_doc' => 1, + 'largeur' => 250]); break; } diff --git a/library/ZendAfi/View/Helper/TagRechercheSimple.php b/library/ZendAfi/View/Helper/TagRechercheSimple.php index 587305337c5246bd0c86b6a07a985b561a812798..684c27e803ad69d94eca98560580474ff8f1668c 100644 --- a/library/ZendAfi/View/Helper/TagRechercheSimple.php +++ b/library/ZendAfi/View/Helper/TagRechercheSimple.php @@ -39,7 +39,7 @@ class ZendAfi_View_Helper_TagRechercheSimple extends Zend_View_Helper_HtmlElemen $arg_filtre = ''; if(array_isset("type_doc", $this->preferences)) $arg_filtre="?facette=T".$this->preferences["type_doc"]; - $this->contenu.='<form name="form" action="'.BASE_URL.'/opac/recherche/simple'.$arg_filtre.'" method="get" class="rechSimpleForm">'; + $this->contenu = '<form name="form" action="'.BASE_URL.'/opac/recherche/simple'.$arg_filtre.'" method="get" class="rechSimpleForm">'; $this->contenu.= '<div>'; if (isset($this->preferences["type_doc"])) $this->contenu.= '<input type="hidden" name="type_doc" value="'.$this->preferences["type_doc"].'" />'; diff --git a/public/opac/css/global.css b/public/opac/css/global.css index 6ce11d1e9f4366531eeab975d1f015c8244726ff..2c7b722a6b014f7445d79e10c1fc1d3c838c6ced 100644 --- a/public/opac/css/global.css +++ b/public/opac/css/global.css @@ -1719,3 +1719,21 @@ button.vodeclic_link + img { } + + +/** historique recherche */ +.recherche_saisie .criteres_recherche ul { + display: table; +} + +.recherche_saisie .criteres_recherche ul li { + display: table-row; +} + +.recherche_saisie .criteres_recherche ul li ul{ + display: table-cell; +} + +.recherche_saisie .criteres_recherche ul li ul li { + display: block +} \ No newline at end of file diff --git a/tests/application/modules/opac/controllers/RechercheControllerTest.php b/tests/application/modules/opac/controllers/RechercheControllerTest.php index 808204038db6751068943014f85b69eabc3435bf..9f74d8055e60f113f5b315d8f4c73dcfecfc2e33 100644 --- a/tests/application/modules/opac/controllers/RechercheControllerTest.php +++ b/tests/application/modules/opac/controllers/RechercheControllerTest.php @@ -1050,9 +1050,9 @@ class RechercheControllerWithPanierTest extends AbstractControllerTestCase { class RechercheControllerActionSimpleWithResetTest extends AbstractControllerTestCase { /** @test */ - public function responseShouldDisplayActionSaisie() { + public function responseShouldRedirectToActionSaisie() { $this->dispatch('/recherche/simple/statut/reset', true); - $this->assertXPath('//input[@name="expressionRecherche"]'); + $this->assertRedirectTo('/opac/recherche/saisie'); } } diff --git a/tests/library/ZendAfi/View/Helper/HistoriqueRechercheTest.php b/tests/library/ZendAfi/View/Helper/HistoriqueRechercheTest.php index 521b7d8dbfcfe7cae77dcebbd264632d8a2fd20a..e1ad2a8068dcb60827b1fbd0154b6787fc05f20d 100644 --- a/tests/library/ZendAfi/View/Helper/HistoriqueRechercheTest.php +++ b/tests/library/ZendAfi/View/Helper/HistoriqueRechercheTest.php @@ -57,13 +57,13 @@ class ZendAfi_View_Helper_HistoriqueRechercheWith2CriteresTest extends ViewHelpe /** @test */ public function URLRechercheSimpleShouldBeDisplay(){ $this->assertXPath($this->_helper->historiqueRecherche(), - '//tr[contains(@onclick, "/recherche/simple/expressionRecherche/Millenium")]'); + '//a[contains(@href, "/recherche/simple/expressionRecherche/Millenium")]'); } /** @test */ public function URLRechercheAvanceShouldBeDisplay(){ $this->assertXPath($this->_helper->historiqueRecherche(), - '//tr[contains(@onclick, "/recherche/simple/rech_titres/Les+hommes+qui+n%27aimaient+pas+les+femmes/rech_auteurs/Larsson")]',$this->_helper->historiqueRecherche()); + '//a[contains(@href, "/recherche/simple/rech_titres/Les+hommes+qui+n%27aimaient+pas+les+femmes/rech_auteurs/Larsson")]',$this->_helper->historiqueRecherche()); } }