diff --git a/library/Class/AvisNotice.php b/library/Class/AvisNotice.php index df19d416102ecb8dcab6c248c5be90d974c234fb..7a5290412af720b6d5acbd48b9c3c823dd2b2830 100644 --- a/library/Class/AvisNotice.php +++ b/library/Class/AvisNotice.php @@ -131,7 +131,7 @@ class Class_AvisNotice extends Storm_Model_Abstract { public static function filterByBibliothecaire($avis_list) { - return self::filterByMethod($avis_list, 'isWrittenByBibliothequaire'); + return self::filterByMethod($avis_list, 'isWrittenByBibliothecaire'); } @@ -237,7 +237,7 @@ class Class_AvisNotice extends Storm_Model_Abstract { } - public function isWrittenByBibliothequaire() { + public function isWrittenByBibliothecaire() { return $this->getAbonOuBib() == 1; } @@ -276,7 +276,7 @@ class Class_AvisNotice extends Storm_Model_Abstract { if ($this->isWrittenByAbonne() && Class_AdminVar::get('MODO_AVIS') == 1) return $this->isModerationOK() == false; - if ($this->isWrittenByBibliothequaire() && Class_AdminVar::get('MODO_AVIS_BIBLIO') == 1) + if ($this->isWrittenByBibliothecaire() && Class_AdminVar::get('MODO_AVIS_BIBLIO') == 1) return $this->isModerationOK() == false; return false; @@ -314,7 +314,7 @@ class Class_AvisNotice extends Storm_Model_Abstract { } public function beforeSave() { - if ((null !== $user = $this->getUser()) && $user->isBibliothequaire()) + if ((null !== $user = $this->getUser()) && $user->isBibliothecaire()) $this->setAbonOuBib(1); else $this->setAbonOuBib(0); diff --git a/library/Class/Notice.php b/library/Class/Notice.php index 18deda01f5cc5deff9246831d2f1d6d1dd046a1b..ba2047ecb1cc20a66ea11731689c050683a4ae9f 100644 --- a/library/Class/Notice.php +++ b/library/Class/Notice.php @@ -187,7 +187,7 @@ class Class_Notice extends Storm_Model_Abstract { public function getAvisBibliothecaire() { - return Class_AvisNotice::filterByBibliothequaire($this->getAvis()); + return Class_AvisNotice::filterByBibliothecaire($this->getAvis()); } @@ -270,8 +270,8 @@ class Class_Notice extends Storm_Model_Abstract { public function getAllAvisPerSource($page = null) { - $all_avis = array('bib' => array('liste' => $avis_bib = $this->getAvisBibliothequaires(), - 'note' => $this->getNoteMoyenneAvisBibliothequaires(), + $all_avis = array('bib' => array('liste' => $avis_bib = $this->getAvisBibliothecaires(), + 'note' => $this->getNoteMoyenneAvisBibliothecaires(), 'nombre' => count($avis_bib), 'titre' => 'Bibliothécaires'), 'abonne' => array('liste' => $avis_abon = $this->getAvisAbonnes(), @@ -289,8 +289,8 @@ class Class_Notice extends Storm_Model_Abstract { } - public function getAvisBibliothequaires() { - return Class_AvisNotice::filterByBibliothequaire($this->getAvis()); + public function getAvisBibliothecaires() { + return Class_AvisNotice::filterByBibliothecaire($this->getAvis()); } public function numberOfAvisBibliothecaire() { @@ -306,9 +306,9 @@ class Class_Notice extends Storm_Model_Abstract { return Class_AvisNotice::countBy(['abon_ou_bib' => 0, 'clef_oeuvre' => $this->getClefOeuvre()]); } - public function getNoteMoyenneAvisBibliothequaires() + public function getNoteMoyenneAvisBibliothecaires() { - return Class_AvisNotice::getNoteAverage($this->getAvisBibliothequaires()); + return Class_AvisNotice::getNoteAverage($this->getAvisBibliothecaires()); } public function getNoteMoyenneAvisAbonnes() diff --git a/library/Class/Users.php b/library/Class/Users.php index 3ac88c9304a4fe0ec0ed0c5e63713de08b5bf860..f6abbc0936587e75f7a9c7e0430676496c5f38bc 100644 --- a/library/Class/Users.php +++ b/library/Class/Users.php @@ -248,7 +248,7 @@ class Class_Users extends Storm_Model_Abstract { } - public function isBibliothequaire() { + public function isBibliothecaire() { return $this->getRoleLevel() >= ZendAfi_Acl_AdminControllerRoles::MODO_BIB; } diff --git a/tests/library/Class/AvisNoticeTest.php b/tests/library/Class/AvisNoticeTest.php index b608b4bd4f8e60095d1fc156d34345e305aea0df..898dc44c8f415368d874bdc6cb1e10b7fa4b65ec 100644 --- a/tests/library/Class/AvisNoticeTest.php +++ b/tests/library/Class/AvisNoticeTest.php @@ -79,9 +79,9 @@ class AvisTestBibAbonne extends ModelTestCase { $this->avis_abon2); } - public function testIsWrittenByBibliothequaire() { - $this->assertTrue($this->avis_bib1->isWrittenByBibliothequaire()); - $this->assertFalse($this->avis_abon1->isWrittenByBibliothequaire()); + public function testIsWrittenByBibliothecaire() { + $this->assertTrue($this->avis_bib1->isWrittenByBibliothecaire()); + $this->assertFalse($this->avis_abon1->isWrittenByBibliothecaire()); } public function testIsWrittenByAbonne() { @@ -94,9 +94,9 @@ class AvisTestBibAbonne extends ModelTestCase { Class_AvisNotice::filterByAbonne($this->all_avis)); } - public function testFilterByBibliothequaire() { + public function testFilterByBibliothecaire() { $this->assertEquals(array($this->avis_bib1, $this->avis_bib2), - Class_AvisNotice::filterByBibliothequaire($this->all_avis)); + Class_AvisNotice::filterByBibliothecaire($this->all_avis)); } public function testGetNoteAverage() { diff --git a/tests/library/Class/NoticeTest.php b/tests/library/Class/NoticeTest.php index 0f1b6bee8a4a1e8d07eb20c6ab2a3e2828791bf3..9733570a2331b921e6f83eca5cc0aeb31552622a 100644 --- a/tests/library/Class/NoticeTest.php +++ b/tests/library/Class/NoticeTest.php @@ -116,16 +116,16 @@ class NoticeTestGetAvis extends ModelTestCase { } - public function testGetAvisBibliothequaires() { + public function testGetAvisBibliothecaires() { $this->assertEquals(array($this->avis_bib1, $this->avis_bib2), - $this->notice->getAvisBibliothequaires()); + $this->notice->getAvisBibliothecaires()); } - public function testGetNoteMoyenneAvisBibliothequaires() { + public function testGetNoteMoyenneAvisBibliothecaires() { $this->assertEquals(4.5, - $this->notice->getNoteMoyenneAvisBibliothequaires()); + $this->notice->getNoteMoyenneAvisBibliothecaires()); }