From 574dca23d69238f52ed01bc282aec7eca406f965 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Tue, 15 Oct 2013 14:53:04 +0000
Subject: [PATCH] Groupes utilisateurs, Lettres d'information, Formations: - le
tableau des utilisateurs affiche le nombre d'inscrits - le tableau est
triable
---
.../View/Helper/Admin/SubscribeUsers.php | 17 +++++++++++++----
.../controllers/NewsletterControllerTest.php | 7 ++++++-
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/library/ZendAfi/View/Helper/Admin/SubscribeUsers.php b/library/ZendAfi/View/Helper/Admin/SubscribeUsers.php
index 6da680e4da8..ea9996b3ab2 100644
--- a/library/ZendAfi/View/Helper/Admin/SubscribeUsers.php
+++ b/library/ZendAfi/View/Helper/Admin/SubscribeUsers.php
@@ -81,9 +81,19 @@ class ZendAfi_View_Helper_Admin_SubscribeUsers extends ZendAfi_View_Helper_BaseH
public function render() {
- $content = '<table><thead><tr class="soustitre">';
+ Class_ScriptLoader::getInstance()->loadTableSorter();
+
+ $nb_users = count($this->_users);
+ $content = '<div style="text-align:right">'.
+ $this->view->_plural($nb_users,
+ 'aucun utilisateur',
+ '%d utilisateur',
+ '%d utilisateurs',
+ $nb_users).'</div>';
+
+ $content .= '<table class="tablesorter"><thead><tr class="soustitre">';
foreach(array('Nom', 'Prénom', 'Identifiant', 'Email', '') as $column)
- $content .= sprintf('<td>%s</td>', $column);
+ $content .= sprintf('<th>%s</th>', $column);
$content .= '</tr></thead><tbody>';
foreach($this->_users as $user)
@@ -106,8 +116,7 @@ class ZendAfi_View_Helper_Admin_SubscribeUsers extends ZendAfi_View_Helper_BaseH
if ($_GET)
$delete_url .= '?'.http_build_query($_GET);
- return sprintf('<tr class="%s"><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>',
- 'first',
+ return sprintf('<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>',
$user->getNom(),
$user->getPrenom(),
$user->getLogin(),
diff --git a/tests/application/modules/admin/controllers/NewsletterControllerTest.php b/tests/application/modules/admin/controllers/NewsletterControllerTest.php
index 2ab1b9015ec..18716846a3e 100644
--- a/tests/application/modules/admin/controllers/NewsletterControllerTest.php
+++ b/tests/application/modules/admin/controllers/NewsletterControllerTest.php
@@ -701,6 +701,12 @@ class Admin_NewsletterControllerEditSubcsribersTest extends Admin_NewsletterCont
}
+ /** @test */
+ public function divShouldContainsUnUtilisateur() {
+ $this->assertXPathContentContains('//div', '1 utilisateur');
+ }
+
+
/** @test */
public function tdShouldContainsMarcel() {
$this->assertXPathContentContains('//td', 'Marcel');
@@ -723,7 +729,6 @@ class Admin_NewsletterControllerEditSubcsribersTest extends Admin_NewsletterCont
public function tdShouldContainsMarcelAtFreeFr() {
$this->assertXPathContentContains('//td', 'marcel@free.fr');
}
-
}
--
GitLab