From 9cf57d67214fb9677c768eeda87443f505c1ce20 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Mon, 21 Oct 2013 08:58:27 +0000
Subject: [PATCH] =?UTF-8?q?Webkiosk:=20ajout=20de=20la=20variable=20pour?=
=?UTF-8?q?=20param=C3=A9trer=20l'url=20de=20r=C3=A9servation=20des=20post?=
=?UTF-8?q?es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/controllers/IndexController.php | 4 +++-
library/Class/AdminVar.php | 1 +
.../controllers/AdminIndexControllerTest.php | 16 ++++++++++++++++
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/application/modules/admin/controllers/IndexController.php b/application/modules/admin/controllers/IndexController.php
index c5d4a98b66d..b265b74fd39 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 06d31651c86..8b579817e0c 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 b35a748bd86..52743bd4a8c 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');
+ }
+
}
--
GitLab