From 43101b0d5bc9eba838f76328de7692bfca48352e Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Mon, 17 Jun 2013 08:38:09 +0000
Subject: [PATCH] =?UTF-8?q?Correction=20redirection=20lien=20Vodeclic=20ve?=
=?UTF-8?q?rs=20l'authentification=20si=20non=20connect=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../opac/controllers/ModulesController.php | 10 ----------
library/Class/Systeme/ModulesMenu/Vodeclic.php | 2 +-
.../opac/controllers/ModulesControllerTest.php | 18 +++++-------------
3 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/application/modules/opac/controllers/ModulesController.php b/application/modules/opac/controllers/ModulesController.php
index 23e8a338de1..c82ca524265 100644
--- a/application/modules/opac/controllers/ModulesController.php
+++ b/application/modules/opac/controllers/ModulesController.php
@@ -18,12 +18,6 @@
* along with AFI-OPAC 2.0; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-//////////////////////////////////////////////////////////////////////////////////////////
-// OPAC3 - Controleur UTILISATEURS
-//
-//@TODO@ :- faire tri sur les entetes de colonnes
-// - Faire une recherche par noms
-//////////////////////////////////////////////////////////////////////////////////////////
class ModulesController extends Zend_Controller_Action {
private $user;
@@ -31,9 +25,6 @@ class ModulesController extends Zend_Controller_Action {
$this->user = ZendAfi_Auth::getInstance()->getIdentity();
}
-
-
-
public function cvsAction() {
$cvs = new Class_Systeme_ModulesMenu_CVS();
$this->_redirect($cvs->getDynamiqueUrl());
@@ -51,5 +42,4 @@ class ModulesController extends Zend_Controller_Action {
$this->_redirect($vodeclic->getDynamiqueUrl());
}
-
}
\ No newline at end of file
diff --git a/library/Class/Systeme/ModulesMenu/Vodeclic.php b/library/Class/Systeme/ModulesMenu/Vodeclic.php
index e07049d0bd2..0c92a8a209a 100644
--- a/library/Class/Systeme/ModulesMenu/Vodeclic.php
+++ b/library/Class/Systeme/ModulesMenu/Vodeclic.php
@@ -40,7 +40,7 @@ class Class_Systeme_ModulesMenu_Vodeclic extends Class_Systeme_ModulesMenu_Null
public function getDynamiqueUrl() {
return ($user = Class_Users::getIdentity())
? $this->getVodeclicUrlForUser($user)
- : BASE_URL . '/auth/login';
+ : '/auth/login';
}
public function getUrl($preferences=[]) {
diff --git a/tests/application/modules/opac/controllers/ModulesControllerTest.php b/tests/application/modules/opac/controllers/ModulesControllerTest.php
index c88de6954f7..f027f92dfec 100644
--- a/tests/application/modules/opac/controllers/ModulesControllerTest.php
+++ b/tests/application/modules/opac/controllers/ModulesControllerTest.php
@@ -24,7 +24,6 @@ class ModulesControllerCVSTest extends AbstractControllerTestCase {
public function setUp() {
parent::setUp();
-
Class_AdminVar::newInstanceWithId('VODECLIC_KEY', ['valeur' => 1234]);
Class_AdminVar::newInstanceWithId('VODECLIC_ID', ['valeur' => 'afi']);
Class_AdminVar::newInstanceWithId('VODECLIC_BIB_ID', ['valeur' => '12']);
@@ -38,8 +37,6 @@ class ModulesControllerCVSTest extends AbstractControllerTestCase {
}
-
-
/** @test */
public function cvsUrlWithoutUserShouldBeLoginPage() {
ZendAfi_Auth::getInstance()->clearIdentity();
@@ -47,12 +44,11 @@ class ModulesControllerCVSTest extends AbstractControllerTestCase {
$this->assertRedirectTo('/auth/login');
}
-
-
}
+
class ModulesControllerVodeclicTest extends AbstractControllerTestCase {
public function setUp() {
parent::setUp();
@@ -62,24 +58,20 @@ class ModulesControllerVodeclicTest extends AbstractControllerTestCase {
}
-
-
/** @test */
public function vodeclicUrlWithoutUserShouldBeLoginPage() {
ZendAfi_Auth::getInstance()->clearIdentity();
$this->dispatch('/opac/modules/vodeclic');
- $this->assertRedirectTo(BASE_URL.'/auth/login');
-
+ $this->assertRedirectTo('/auth/login');
}
+}
-}
class ModulesControllerNumilogTest extends AbstractControllerTestCase {
public function setUp() {
parent::setUp();
-
Class_AdminVar::newInstanceWithId('NUMILOG_URL',['valeur' => 'http://numilogurl/action']);
}
@@ -91,7 +83,7 @@ class ModulesControllerNumilogTest extends AbstractControllerTestCase {
$this->assertRedirectTo('http://numilogurl/action');
}
+}
-
-}
\ No newline at end of file
+?>
\ No newline at end of file
--
GitLab