From dc7384c92003856fbdf8fc472ce91ca86c18fa01 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Sat, 20 Oct 2012 12:29:45 +0000
Subject: [PATCH] =?UTF-8?q?Suggestion=20d'achat:=20affichage=20de=20la=20b?=
=?UTF-8?q?iblioth=C3=A8que=20de=20l'abonn=C3=A9=20qui=20a=20sugg=C3=A9r?=
=?UTF-8?q?=C3=A9=20un=20achat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitattributes | 1 -
.../views/scripts/modo/suggestion-achat.phtml | 4 ++--
.../views/scripts/suggestion-achat/index.phtml | 12 ------------
library/Class/SuggestionAchat.php | 9 +++++++++
library/Class/Users.php | 17 +++++++++--------
.../admin/controllers/ModoControllerTest.php | 14 ++++++++++++--
6 files changed, 32 insertions(+), 25 deletions(-)
delete mode 100644 application/modules/admin/views/scripts/suggestion-achat/index.phtml
diff --git a/.gitattributes b/.gitattributes
index dae023f83ee..5a186e02614 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -524,7 +524,6 @@ application/modules/admin/views/scripts/stat/reservationnotice.phtml -text
application/modules/admin/views/scripts/stat/visunotice.phtml -text
application/modules/admin/views/scripts/subModal.phtml -text
application/modules/admin/views/scripts/suggestion-achat/edit.phtml -text
-application/modules/admin/views/scripts/suggestion-achat/index.phtml -text
application/modules/admin/views/scripts/systeme/cacheimages.phtml -text
application/modules/admin/views/scripts/systeme/importavisopac2.phtml -text
application/modules/admin/views/scripts/systeme/mailtest.phtml -text
diff --git a/application/modules/admin/views/scripts/modo/suggestion-achat.phtml b/application/modules/admin/views/scripts/modo/suggestion-achat.phtml
index 097146e4df9..c7743bbed6f 100644
--- a/application/modules/admin/views/scripts/modo/suggestion-achat.phtml
+++ b/application/modules/admin/views/scripts/modo/suggestion-achat.phtml
@@ -7,9 +7,9 @@
} else {
echo $this->tagModelTable($this->suggestions,
- [$this->_('Date'), $this->_('Titre'), $this->_('Auteur'), $this->_('N° abonné'), $this->_('Compte')],
+ [$this->_('Date'), $this->_('Titre'), $this->_('Auteur'), $this->_('N° abonné'), $this->_('Bibliothèque'), $this->_('Compte')],
- ['date_creation', 'titre', 'auteur', 'idabon', 'compte'],
+ ['date_creation', 'titre', 'auteur', 'idabon', 'libelle_bib', 'compte'],
[ ['action' => 'suggestion-achat-edit', 'content' => $this->boutonIco('type=edit')],
['action' => 'suggestion-achat-delete', 'content' => $this->boutonIco('type=del')] ],
diff --git a/application/modules/admin/views/scripts/suggestion-achat/index.phtml b/application/modules/admin/views/scripts/suggestion-achat/index.phtml
deleted file mode 100644
index 2d3dfc51d91..00000000000
--- a/application/modules/admin/views/scripts/suggestion-achat/index.phtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-echo $this->tagModelTable($this->suggestions,
-
- [$this->_('Date'), $this->_('Titre'), $this->_('Auteur'), $this->_('N° abonné')],
-
- ['date_creation', 'titre', 'auteur', 'idabon'],
-
- [ ['action' => 'edit', 'content' => $this->boutonIco('type=edit')],
- ['action' => 'delete', 'content' => $this->boutonIco('type=del')] ],
-
- 'suggestions');
-?>
\ No newline at end of file
diff --git a/library/Class/SuggestionAchat.php b/library/Class/SuggestionAchat.php
index 0e3cfd20d32..ea40fd3f6a7 100644
--- a/library/Class/SuggestionAchat.php
+++ b/library/Class/SuggestionAchat.php
@@ -109,5 +109,14 @@ class Class_SuggestionAchat extends Storm_Model_Abstract {
return $this->getUser()->getNomComplet();
return '';
}
+
+
+ public function getLibelleBib() {
+ if ($user = $this->getUser())
+ return $user->getLibelleBib();
+
+ return '';
+ }
+
}
?>
\ No newline at end of file
diff --git a/library/Class/Users.php b/library/Class/Users.php
index 71e5924ad39..83e4cd92f9e 100644
--- a/library/Class/Users.php
+++ b/library/Class/Users.php
@@ -209,14 +209,6 @@ class Class_Users extends Storm_Model_Abstract {
}
- /**
- * @return UsersLoader
- */
- public static function getLoader() {
- return self::getLoaderFor(__CLASS__);
- }
-
-
public static function currentUserId() {
if (!$user = self::getLoader()->getIdentity())
return 0;
@@ -234,10 +226,19 @@ class Class_Users extends Storm_Model_Abstract {
return $this->getRoleLevel() == ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB;
}
+
public function isBibliothequaire() {
return $this->getRoleLevel() >= ZendAfi_Acl_AdminControllerRoles::MODO_BIB;
}
+
+ public function getLibelleBib() {
+ if (!$bib = $this->getBib())
+ return '';
+ return $bib->getLibelle();
+ }
+
+
/**
* @return bool
*/
diff --git a/tests/application/modules/admin/controllers/ModoControllerTest.php b/tests/application/modules/admin/controllers/ModoControllerTest.php
index a433390de58..c51d99569cb 100644
--- a/tests/application/modules/admin/controllers/ModoControllerTest.php
+++ b/tests/application/modules/admin/controllers/ModoControllerTest.php
@@ -97,7 +97,9 @@ abstract class ModoControllerSuggestionAchatTestCase extends Admin_AbstractContr
->beInvite()
->setIdabon('0')
->setPrenom('Marcel')
- ->setNom('Duchamp'))
+ ->setNom('Duchamp')
+ ->setBib(Class_Bib::newInstanceWithId(3)
+ ->setLibelle('Annecy')))
]);
}
}
@@ -167,11 +169,19 @@ class ModoControllerSuggestionAchatActionTest extends ModoControllerSuggestionAc
/** @test */
public function fourthRowTDShouldContainsMarcelDuchamp() {
- $this->assertXPathContentContains('//tr[3]//td[5]', 'Marcel Duchamp');
+ $this->assertXPathContentContains('//tr[3]//td[6]', 'Marcel Duchamp');
+ }
+
+
+ /** @test */
+ public function fourthRowTDShouldContainsBibAnnecy() {
+ $this->assertXPathContentContains('//tr[3]//td[5]', 'Annecy');
}
}
+
+
class ModoControllerSuggestionAchatEditHarryPotterTest extends ModoControllerSuggestionAchatTestCase {
public function setUp() {
parent::setUp();
--
GitLab