Skip to content
Snippets Groups Projects
Commit f95e9d36 authored by Ghislain Loas's avatar Ghislain Loas
Browse files

dev #75882 : fix failures

parent 97b0ab22
Branches
Tags
3 merge requests!2711Dev#75882 minsoc faire des filtres sur des facettes et des domaines au moment de la recherche s2,!2707Tessadoc lost pass,!2699Dev#75882 minsoc faire des filtres sur des facettes et des domaines au moment de la recherche s2
Pipeline #4412 failed with stage
in 34 minutes and 25 seconds
...@@ -196,6 +196,9 @@ class Class_WebService_Lastfm extends Class_WebService_Abstract { ...@@ -196,6 +196,9 @@ class Class_WebService_Lastfm extends Class_WebService_Abstract {
$photos = []; $photos = [];
foreach($elements as $element) { foreach($elements as $element) {
if (!$element)
continue;
$url = $element->getAttribute('src'); $url = $element->getAttribute('src');
$photos []= ['thumb' => $url, $photos []= ['thumb' => $url,
......
...@@ -51,13 +51,13 @@ class ZendAfi_Controller_Plugin_Manager_BookmarkedSearches extends ZendAfi_Contr ...@@ -51,13 +51,13 @@ class ZendAfi_Controller_Plugin_Manager_BookmarkedSearches extends ZendAfi_Contr
protected function _checkBookmarkedSearchRequest() { protected function _checkBookmarkedSearchRequest() {
if(!$search = $this->_findModel()) { if(!$search = $this->_findModel()) {
$this->_helper->_notify($this->_('La recherche demandée est introuvable.')); $this->_helper->notify($this->_('La recherche demandée est introuvable.'));
$this->_redirectToIndex(); $this->_redirectToIndex();
return; return;
} }
if(!$search->belongsTo($this->_user)) { if(!$search->belongsTo($this->_user)) {
$this->_helper->_notify($this->_('Cette recherche ne vous appartient pas.')); $this->_helper->notify($this->_('Cette recherche ne vous appartient pas.'));
$this->_redirectToIndex(); $this->_redirectToIndex();
return; return;
} }
...@@ -82,7 +82,7 @@ class ZendAfi_Controller_Plugin_Manager_BookmarkedSearches extends ZendAfi_Contr ...@@ -82,7 +82,7 @@ class ZendAfi_Controller_Plugin_Manager_BookmarkedSearches extends ZendAfi_Contr
$search->beNotified()->save(); $search->beNotified()->save();
$this->_helper->_notify($this->_('Les notifications de nouveautés pour la recherche "%s" sont activées.', $search->getLabel())); $this->_helper->notify($this->_('Les notifications de nouveautés pour la recherche "%s" sont activées.', $search->getLabel()));
$this->_redirectToIndex(); $this->_redirectToIndex();
} }
...@@ -93,7 +93,7 @@ class ZendAfi_Controller_Plugin_Manager_BookmarkedSearches extends ZendAfi_Contr ...@@ -93,7 +93,7 @@ class ZendAfi_Controller_Plugin_Manager_BookmarkedSearches extends ZendAfi_Contr
$search->beUnnotified()->save(); $search->beUnnotified()->save();
$this->_helper->_notify($this->_('Les notifications de nouveautés pour la recherche "%s" sont désactivées.', $search->getLabel())); $this->_helper->notify($this->_('Les notifications de nouveautés pour la recherche "%s" sont désactivées.', $search->getLabel()));
$this->_redirectToIndex(); $this->_redirectToIndex();
} }
......
...@@ -198,6 +198,7 @@ abstract class AbstractControllerTestCase extends Zend_Test_PHPUnit_ControllerTe ...@@ -198,6 +198,7 @@ abstract class AbstractControllerTestCase extends Zend_Test_PHPUnit_ControllerTe
Class_FileManager::reset(); Class_FileManager::reset();
Class_Notice_Xsl::reset(); Class_Notice_Xsl::reset();
Class_CommSigb::setInstance(null); Class_CommSigb::setInstance(null);
ZendAfi_Acl_AdminControllerGroup::setAcl(null);
} }
......
...@@ -29,6 +29,8 @@ abstract class AuthorBrowserTestCase extends Admin_AbstractControllerTestCase { ...@@ -29,6 +29,8 @@ abstract class AuthorBrowserTestCase extends Admin_AbstractControllerTestCase {
public function setUp() { public function setUp() {
parent::setUp(); parent::setUp();
Class_AdminVar::set('CODIFICATION_BROWSER', 1);
$this->_erroc = $this->fixture('Class_CodifAuteur', $this->_erroc = $this->fixture('Class_CodifAuteur',
['id' => 15, ['id' => 15,
'libelle' => 'Erroc']); 'libelle' => 'Erroc']);
......
...@@ -25,6 +25,9 @@ class Pcdm4BrowserIndexChildrenTest extends Admin_AbstractControllerTestCase{ ...@@ -25,6 +25,9 @@ class Pcdm4BrowserIndexChildrenTest extends Admin_AbstractControllerTestCase{
public function setUp() { public function setUp() {
parent::setUp(); parent::setUp();
Class_AdminVar::set('CODIFICATION_BROWSER', 1);
$mainstream = $this->fixture('Class_CodifPcdm4', $mainstream = $this->fixture('Class_CodifPcdm4',
['id' => '0', ['id' => '0',
'libelle' => 'Mainstream']); 'libelle' => 'Mainstream']);
......
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