diff --git a/application/modules/admin/controllers/IndexController.php b/application/modules/admin/controllers/IndexController.php index c5d4a98b66de1c0ebaa7eb38eabb0bce351fca10..b265b74fd398e40126b77516da9e3d424b369c84 100644 --- a/application/modules/admin/controllers/IndexController.php +++ b/application/modules/admin/controllers/IndexController.php @@ -182,7 +182,9 @@ class Admin_IndexController extends Zend_Controller_Action { 'CHAMPS_FICHE_UTILISATEUR' => 'Liste des champs que l\'utilisateur peux modifier. <br/>Ex: nom;prenom;pseudo;adresse;<br/>code_postal;ville;mail;is_contact_mail;<br/>telephone;is_contact_telephone;', 'URL_TYPO3' => 'Url d\'import d\un agenda TYPO3', 'AFFICHER_DISPONIBILITE_SUR_RECHERCHE' => 'Activation de la disponibilite dans le resultat de recherche. 0 = inactif, 1 = actif', - 'NOM_DOMAINE' => 'Nom de domaine principal de l\'OPAC, ex: monopac.macommune.fr' + 'NOM_DOMAINE' => 'Nom de domaine principal de l\'OPAC, ex: monopac.macommune.fr', + 'WEBKIOSK_KEY' => 'Clé publique pour le cryptage des données Aesis Webkiosk', + 'WEBKIOSK_RESERVATION_URL' => 'URL d\'accès à l\'interface de réservation des postes Aesis Webkiosk' ); diff --git a/library/Class/AdminVar.php b/library/Class/AdminVar.php index 06d31651c865da2b4468c8fba8cdfd8e3aa7d1e7..8b579817e0cd26c2bbfa11a0ee54b478f45649d9 100644 --- a/library/Class/AdminVar.php +++ b/library/Class/AdminVar.php @@ -73,6 +73,7 @@ class Class_AdminVar extends Storm_Model_Abstract { 'BABELTHEQUE_JS', 'MULTIMEDIA_KEY', 'WEBKIOSK_KEY', + 'WEBKIOSK_RESERVATION_URL', 'CSS_EDITOR', 'CMS_FORMULAIRES', 'MENU_BOITE', diff --git a/tests/application/modules/admin/controllers/AdminIndexControllerTest.php b/tests/application/modules/admin/controllers/AdminIndexControllerTest.php index b35a748bd86cb338fffc255127953615098b4f7e..52743bd4a8c57d8105bc9c83fe4ee2064878af53 100644 --- a/tests/application/modules/admin/controllers/AdminIndexControllerTest.php +++ b/tests/application/modules/admin/controllers/AdminIndexControllerTest.php @@ -135,6 +135,9 @@ class AdminIndexControllerIndexActionTest extends AdminIndexControllerTestCase { } } + + + class AdminIndexControllerAdminVarActionTest extends Admin_AbstractControllerTestCase { public function setUp() { parent::setUp(); @@ -155,6 +158,19 @@ class AdminIndexControllerAdminVarActionTest extends Admin_AbstractControllerTes public function avisMaxSaisieEditLinkShouldBePresent() { $this->assertXpath('//a[contains(@href, "adminvaredit/cle/AVIS_MAX_SAISIE")]'); } + + + /** @test */ + public function webkioskReservatioURLShouldBePresent() { + $this->assertXpathContentContains('//td', 'WEBKIOSK_RESERVATION_URL'); + } + + + /** @test */ + public function webkioskKeyShouldBePresent() { + $this->assertXpathContentContains('//td', 'WEBKIOSK_KEY'); + } + }