diff --git a/VERSIONS_HOTLINE/52108 b/VERSIONS_HOTLINE/52108 new file mode 100644 index 0000000000000000000000000000000000000000..3263a3a8913a317de362a3e4c59b3e49ba6e11d9 --- /dev/null +++ b/VERSIONS_HOTLINE/52108 @@ -0,0 +1 @@ + - ticket #52108 : Administration des profils : Correction du paramètre de filtrage par bibliothèque \ No newline at end of file diff --git a/library/Class/Zone.php b/library/Class/Zone.php index 26202a697e4c8823d8e415d0bc6fb6f8f16d0d3f..52cbf31e92d36a4f73b60d927ea5e7a39438f7fe 100644 --- a/library/Class/Zone.php +++ b/library/Class/Zone.php @@ -43,14 +43,13 @@ class ZoneLoader extends Storm_Model_Loader { } - public function getZones($id_zone=0) - { - return - Class_Zone::getLoader()->findAllBy(array_filter(['id_zone' => $id_zone, - 'order' => 'LIBELLE'])); + public function getZones($id_zone=0) { + $params = ['order' => 'libelle']; + if ((int)$id_zone) + $params['id_zone'] = (int)$id_zone; + return Class_Zone::findAllBy($params); } - } diff --git a/tests/application/modules/admin/controllers/ProfilControllerTest.php b/tests/application/modules/admin/controllers/ProfilControllerTest.php index e16f1372da4df10b2ff0aa4b3bc00514d7bc9ab1..d25593e44e474a0372b06f6cd8391cf7cb8c14cb 100644 --- a/tests/application/modules/admin/controllers/ProfilControllerTest.php +++ b/tests/application/modules/admin/controllers/ProfilControllerTest.php @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ abstract class Admin_ProfilControllerProfilJeunesseTestCase extends Admin_AbstractControllerTestCase { + protected $_storm_default_to_volatile = true; + public function setUp() { parent::setUp(); $cfg_site = ['header_img' => "/public/jeunesse.png", @@ -1546,3 +1548,30 @@ class Admin_ProfilControllerProfilPortalLoginPagePostTest extends Admin_Abstract $this->assertEquals(2, Class_Profil::find(1)->getLoginPage()); } } + + + +/** @see http://forge.afi-sa.fr/issues/52108 */ +class Admin_ProfilControllerEditLibraryFilterTest extends Admin_AbstractControllerTestCase { + protected $_storm_default_to_volatile = true; + + public function setUp() { + parent::setUp(); + + $this->fixture('Class_Bib', + ['id' => 9, + 'libelle' => 'Annecy', + 'zone' => $this->fixture('Class_Zone', + ['id' => 12, + 'libelle' => 'Haute-Savoie'])]); + + $this->dispatch('/admin/profil/edit/id_profil/1', true); + } + + + /** @test */ + public function annecyFilterShouldBePresent() { + $this->assertXPathContentContains('//select[@name="id_site"]//option[@value="9"]', + 'Annecy'); + } +}