hotline #25358 sito search

when start_cat supplied on title search, limit search to this category
and child

library/ZendAfi/Controller/Action/Helper/SitothequeListViewMode.php

@@ -79,8 +79,20 @@ class ZendAfi_Controller_Action_Helper_SitothequeListViewMode extends ZendAfi_Co
 
 
 	protected function getSearchParams() {
-		return ['where' => 'titre like \'%' . trim($this->getSearch()) . '%\'',
-						'order' => 'titre'];
+		$search_params = ['where' => 'titre like \'%' . trim($this->getSearch()) . '%\'',
+											'order' => 'titre'];
+
+		if (!$start_cat_id = $this->getRequestParam('start_cat'))
+			return $search_params;
+
+		if (!$start_cat = Class_SitothequeCategorie::find($start_cat_id))
+			return $search_params;
+
+
+		$id_cats = (new Storm_Model_Collection($start_cat->getRecursiveSousCategories()))->collect('id');
+		$id_cats->append($start_cat->getId());
+		$search_params['id_cat'] = $id_cats->getArrayCopy();
+		return $search_params;
 	}
 
 

library/ZendAfi/View/Helper/PublicListViewMode.php

@@ -73,6 +73,7 @@ class ZendAfi_View_Helper_PublicListViewMode extends  ZendAfi_View_Helper_Admin_
 
 
 	protected function getItemsHtml() {
+		xdebug_break();
 		if (!$this->_list->getModel() && !$this->_list->getSearchValue())
 			 return '';
 

tests/application/modules/opac/controllers/SitoControllerTest.php

@@ -58,7 +58,8 @@ abstract class SitoControllerTestCase extends AbstractControllerTestCase {
 }
 
 
-class SitoControllerViewCategoyTest extends SitoControllerTestCase {
+
+abstract class SitoControllerViewCategoyTestCase extends SitoControllerTestCase {
 	public function setUp() {
 		parent::setUp();
 		$collectif = $this->fixture('Class_SitothequeCategorie',
@@ -104,7 +105,15 @@ class SitoControllerViewCategoyTest extends SitoControllerTestCase {
 																															 'type_aff' => '3',
 																															 'id_items' => '280-281']]],
 											 'options' => []]);
+	}
+}
+
+
 
+
+class SitoControllerViewCategoyTest extends SitoControllerViewCategoyTestCase {
+	public function setUp() {
+		parent::setUp();
 		$this->dispatch('/sito/viewcategory/id_cat/12/start_cat/12', true);
 	}
 
@@ -157,6 +166,40 @@ class SitoControllerViewRecentTest extends SitoControllerTestCase {
 
 
 
+
+class SitoControllerViewCategorySearchTest extends SitoControllerViewCategoyTestCase {
+	public function setUp() {
+		parent::setUp();
+
+		Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Sitotheque')
+			->whenCalled('findAllBy')
+			->with(['where' => 'titre like \'%framasoft%\'',
+							'order' => 'titre',
+							'limitPage' => [1, 25],
+							'id_cat' => [17, 19, 12]])
+			->answers([Class_Sitotheque::find(281)]);
+
+		$this->dispatch('/sito/viewcategory/start_cat/12/title_search/framasoft', true);
+	}
+
+
+	/** @test */
+	public function framasoftShouldBeShown() {
+		$this->assertXPath('//div[@class="sitotheque"]//a[@href="http://framasoft.org"]',
+											 $this->_response->getBody());
+	}
+
+
+  /** @test */
+	public function linuxFrShouldNotBeShown() {
+		$this->assertNotXPath('//div[@class="sitotheque"]//a[@href="http://linuxfr.org"]',
+													$this->_response->getBody());
+	}
+}
+
+
+
+
 class SitoControllerViewSelectionTest extends SitoControllerTestCase {
 	public function setUp() {
 		parent::setUp();