Merge branch 'hotline#180160_pnb_usage_search_form' into 'master'

hotline#180160 : Restore PNB genre and section form elements in pnb/usage page

See merge request !4767

VERSIONS_HOTLINE/180160

+ - correctif #180160 : restaure les listes de genres et sections dans le formulaire d'usage PNB Dilicom 
\ No newline at end of file

library/Class/Album/UsageReport/SearchCriteria.php

@@ -115,7 +115,7 @@ abstract class Class_Album_UsageReport_SearchCriteria_SelectElement extends Clas
 class Class_Album_UsageReport_SearchCriteria_Genre extends Class_Album_UsageReport_SearchCriteria_SelectElement {
   protected
     $_checkbox_name = ZendAfi_View_Helper_TagListeCoches::SOURCE_GENRE_PNB,
-    $_name = 'genres';
+    $_name = 'genre_pnb';
 
   protected function _getElement($id) {
     return Class_CodifGenre::find($id);
@@ -138,7 +138,7 @@ class Class_Album_UsageReport_SearchCriteria_Genre extends Class_Album_UsageRepo
 class Class_Album_UsageReport_SearchCriteria_Section extends Class_Album_UsageReport_SearchCriteria_SelectElement {
   protected
     $_checkbox_name = ZendAfi_View_Helper_TagListeCoches::SOURCE_SECTION_PNB,
-    $_name = 'sections';
+    $_name = 'section_pnb';
 
   protected function _getElement($id) {
     return Class_CodifSection::find($id);

tests/scenarios/PnbDilicom/PnbDilicomAdminTest.php

@@ -438,6 +438,8 @@ class PnbDilicomAdminUsageTest extends PnbDilicomAdminTestCase {
   public function setUp() {
     parent::setUp();
 
+    Class_AdminVar::set('DILICOM_PNB_BOARD_DISPLAY_SECTION', true);
+
     (new Class_Batch_DilicomJobGenerateUsageReport(new Class_Batch_Dilicom))
       ->setLogger($this->getLogger())
       ->run();
@@ -452,6 +454,17 @@ class PnbDilicomAdminUsageTest extends PnbDilicomAdminTestCase {
   }
 
 
+  /** @test */
+  public function inputSearchGenreShouldBePresent() {
+    $this->assertXPath( '//div[@id="search_genre_pnb_aff"]');
+  }
+
+  /** @test */
+  public function inputSearchSectionShouldBePresent() {
+    $this->assertXPath( '//div[@id="search_section_pnb_aff"]');
+  }
+
+
   /** @test */
   public function inputOrderDateShouldBeDisplay() {
     $this->assertXPath( '//input[@name="search_order_date_debut"]');