diff --git a/application/modules/admin/controllers/UsersController.php b/application/modules/admin/controllers/UsersController.php
index b573c5389b2a9ce2ff20ce80f8acbf24ef669fe6..863ffc2417bf43739bba98a72894e64ece909d87 100644
--- a/application/modules/admin/controllers/UsersController.php
+++ b/application/modules/admin/controllers/UsersController.php
@@ -97,6 +97,7 @@ class Admin_UsersController extends Zend_Controller_Action
->setPassword('')
->setNom('')
->setPrenom('')
+ ->setPseudo('')
->setMail('')
->setRoleLevel(0)
->setRole('')
@@ -131,6 +132,7 @@ class Admin_UsersController extends Zend_Controller_Action
->setPassword($data['password'])
->setNom($data['nom'])
->setPrenom($data['prenom'])
+ ->setPseudo($data['pseudo'])
->setMail($data['mail'])
->setNaissance($data['naissance'])
->setRoleLevel($data['role'])
diff --git a/application/modules/admin/views/scripts/users/_form.phtml b/application/modules/admin/views/scripts/users/_form.phtml
index 99b91881ce99c0dfb8cdea5cee39b6c3597061a4..8626ba289658212a5de6fdf9327b9033464de1fe 100644
--- a/application/modules/admin/views/scripts/users/_form.phtml
+++ b/application/modules/admin/views/scripts/users/_form.phtml
@@ -4,117 +4,121 @@
<link rel="stylesheet" type="text/css" media="screen" href="<?php echo URL_ADMIN_CSS?>subModal.css" />
<div class="form">
- <form name="form" action="<?php echo BASE_URL ?>/admin/users/<?php print($this->action."/id/".$this->id_user); ?>"method="post">
- <fieldset>
- <legend><?php echo $this->traduire('Utilisateur'); ?></legend>
- <span id="abonne_erreur" class="abonne"><?php echo $this->erreurs; ?></span>
- <table cellspacing="2">
- <tr>
- <td class="droite">Identifiant *</td>
- <td class="gauche"><input type="text" name="username" onkeypress="if (event.keyCode == 13) {javascript:PicToolbarOver( getElementById('menu_item975'), 'menu_item975');this.form.submit();return false;}" value="<?php echo $this->escape($this->user->getLogin());?>" maxlength="80"/></td>
- </tr>
- <tr>
- <td class="droite">Mot de passe *</td>
- <td class="gauche"><input type="text" name="password" onkeypress="if (event.keyCode == 13) {javascript:PicToolbarOver( getElementById('menu_item975'), 'menu_item975');this.form.submit();return false;}" value="<?php echo $this->escape($this->user->getPassword());?>"/></td>
- </tr>
- <tr>
- <td class="droite">Nom </td>
- <td class="gauche"><input type="text" name="nom" size="50" value="<?php echo $this->escape($this->user->getNom());?>"/></td>
- </tr>
- <tr>
- <td class="droite">Prénom </td>
- <td class="gauche"><input type="text" name="prenom" size="50" value="<?php echo $this->escape($this->user->getPrenom());?>"/></td>
- </tr>
- <tr>
- <td class="droite">Date de naissance </td>
- <td class="gauche"><input type="text" name="naissance" size="10" value="<?php echo $this->escape($this->user->getNaissance());?>"/></td>
- </tr>
- <tr>
- <td class="droite"><?php echo $this->traduire('Rôle'); ?> </td>
- <td class="gauche">
- <?php $comboListeRole = new ZendAfi_Acl_AdminControllerRoles();
- if ($this->user->getId() == '1')
- echo '<select disabled="disabled"><option selected="selected" value="7">super_admin</option></select><input type="hidden" value="7" name="role" id="role"/>';
- else
- print $comboListeRole->rendCombo($this->user->getRole(),$this->authUser->ROLE_LEVEL);
- ?>
+ <form name="form" action="<?php echo BASE_URL ?>/admin/users/<?php print($this->action."/id/".$this->id_user); ?>"method="post">
+ <fieldset>
+ <legend><?php echo $this->traduire('Utilisateur'); ?></legend>
+ <span id="abonne_erreur" class="abonne"><?php echo $this->erreurs; ?></span>
+ <table cellspacing="2">
+ <tr>
+ <td class="droite">Identifiant *</td>
+ <td class="gauche"><input type="text" name="username" onkeypress="if (event.keyCode == 13) {javascript:PicToolbarOver( getElementById('menu_item975'), 'menu_item975');this.form.submit();return false;}" value="<?php echo $this->escape($this->user->getLogin());?>" maxlength="80"/></td>
+ </tr>
+ <tr>
+ <td class="droite">Mot de passe *</td>
+ <td class="gauche"><input type="text" name="password" onkeypress="if (event.keyCode == 13) {javascript:PicToolbarOver( getElementById('menu_item975'), 'menu_item975');this.form.submit();return false;}" value="<?php echo $this->escape($this->user->getPassword());?>"/></td>
+ </tr>
+ <tr>
+ <td class="droite">Nom </td>
+ <td class="gauche"><input type="text" name="nom" size="50" value="<?php echo $this->escape($this->user->getNom());?>"/></td>
+ </tr>
+ <tr>
+ <td class="droite">Prénom </td>
+ <td class="gauche"><input type="text" name="prenom" size="50" value="<?php echo $this->escape($this->user->getPrenom());?>"/></td>
+ </tr>
+ <tr>
+ <td class="droite">Pseudo </td>
+ <td class="gauche"><input type="text" name="pseudo" size="50" value="<?php echo $this->escape($this->user->getPseudo());?>"/></td>
+ </tr>
+ <tr>
+ <td class="droite">Date de naissance </td>
+ <td class="gauche"><input type="text" name="naissance" size="10" value="<?php echo $this->escape($this->user->getNaissance());?>"/></td>
+ </tr>
+ <tr>
+ <td class="droite"><?php echo $this->traduire('Rôle'); ?> </td>
+ <td class="gauche">
+ <?php $comboListeRole = new ZendAfi_Acl_AdminControllerRoles();
+ if ($this->user->getId() == '1')
+ echo '<select disabled="disabled"><option selected="selected" value="7">super_admin</option></select><input type="hidden" value="7" name="role" id="role"/>';
+ else
+ print $comboListeRole->rendCombo($this->user->getRole(),$this->authUser->ROLE_LEVEL);
+ ?>
- </td>
- </tr>
- <tr id="option_bib">
- <td class="droite">Bibliothèque </td>
- <td class="gauche">
- <?php
- if (($this->user->getRoleLevel() <= ZendAfi_Acl_AdminControllerRoles::ADMIN_BIB) and ($bib = Class_Bib::getLoader()->find($this->id_bib))) {
- echo '<select disabled="disabled"><option selected="selected" value="'.$this->id_bib.'">'.$bib->LIBELLE.'</option></select>
- <input type="hidden" value="'.$this->id_bib.'" name="bib" id="bib"/>';
- } else {
- $bib = new Class_Bib();
- echo $bib->getComboBib($this->user->getIdSite());
- }
- ?>
- <script type="text/javascript">
- formSelectToggleVisibilityForElement("select[name='role']",
- "#option_bib",
- ["2", "3", "4"]);
- formSelectToggleVisibilityForElement("select[name='role']",
- "#abonne_sigb", "2");
- </script>
- </td>
- </tr>
- <tr>
- <td class="droite">E-mail </td>
- <td class="gauche"><input type="text" name="mail" size="50" value="<?php echo $this->escape($this->user->getMail());?>"/></td>
- </tr>
- <tr>
- <td class="droite">Téléphone </td>
- <td class="gauche"><input type="text" name="telephone" size="50" value="<?php echo $this->escape($this->user->getTelephone());?>"/></td>
- </tr>
- <tr>
- <td class="droite">Adresse </td>
- <td class="gauche"><textarea name="adresse" rows="5"><?php echo $this->escape($this->user->getAdresse());?></textarea></td>
- </tr>
- <tr>
- <td class="droite">Code postal </td>
- <td class="gauche"><input type="text" name="code_postal" size="10" value="<?php echo $this->escape($this->user->getCodePostal());?>"/></td>
- </tr>
- <tr>
- <td class="droite">Ville </td>
- <td class="gauche"><input type="text" name="ville" size="50" value="<?php echo $this->escape($this->user->getVille());?>"/></td>
- </tr>
- </table>
- </fieldset>
+ </td>
+ </tr>
+ <tr id="option_bib">
+ <td class="droite">Bibliothèque </td>
+ <td class="gauche">
+ <?php
+ if (($this->user->getRoleLevel() <= ZendAfi_Acl_AdminControllerRoles::ADMIN_BIB) and ($bib = Class_Bib::getLoader()->find($this->id_bib))) {
+ echo '<select disabled="disabled"><option selected="selected" value="'.$this->id_bib.'">'.$bib->LIBELLE.'</option></select>
+ <input type="hidden" value="'.$this->id_bib.'" name="bib" id="bib"/>';
+ } else {
+ $bib = new Class_Bib();
+ echo $bib->getComboBib($this->user->getIdSite());
+ }
+ ?>
+ <script type="text/javascript">
+ formSelectToggleVisibilityForElement("select[name='role']",
+ "#option_bib",
+ ["2", "3", "4"]);
+ formSelectToggleVisibilityForElement("select[name='role']",
+ "#abonne_sigb", "2");
+ </script>
+ </td>
+ </tr>
+ <tr>
+ <td class="droite">E-mail </td>
+ <td class="gauche"><input type="text" name="mail" size="50" value="<?php echo $this->escape($this->user->getMail());?>"/></td>
+ </tr>
+ <tr>
+ <td class="droite">Téléphone </td>
+ <td class="gauche"><input type="text" name="telephone" size="50" value="<?php echo $this->escape($this->user->getTelephone());?>"/></td>
+ </tr>
+ <tr>
+ <td class="droite">Adresse </td>
+ <td class="gauche"><textarea name="adresse" rows="5"><?php echo $this->escape($this->user->getAdresse());?></textarea></td>
+ </tr>
+ <tr>
+ <td class="droite">Code postal </td>
+ <td class="gauche"><input type="text" name="code_postal" size="10" value="<?php echo $this->escape($this->user->getCodePostal());?>"/></td>
+ </tr>
+ <tr>
+ <td class="droite">Ville </td>
+ <td class="gauche"><input type="text" name="ville" size="50" value="<?php echo $this->escape($this->user->getVille());?>"/></td>
+ </tr>
+ </table>
+ </fieldset>
- <fieldset id="abonne_sigb">
- <legend><?php echo $this->traduire('Abonné sigb'); ?></legend>
- <table cellspacing="2">
- <tr>
- <td class="droite" style="width:150px">Numéro de carte </td>
- <td class="gauche"><input type="text" name="id_abon" value="<?php echo $this->escape($this->user->getIdabon());?>"/></td>
- </tr>
- <tr>
- <td class="droite">Ordre </td>
- <td class="gauche"><input type="text" name="ordre" size="3" onkeypress="if (event.keyCode == 13) {javascript:PicToolbarOver( getElementById('menu_item975'), 'menu_item975');this.form.submit();return false;}" value="<?php echo $this->escape($this->user->getOrdreabon());?>"/></td>
- </tr>
- <tr>
- <td class="droite">Abonnement valide - du </td>
- <td class="gauche"><?php echo formatDate($this->user->getDateDebut(),1);?></td>
- </tr>
- <tr>
- <td class="droite">au </td>
- <td class="gauche"><?php echo formatDate($this->user->getDateFin(),1);?></td>
- </tr>
- </table>
+ <fieldset id="abonne_sigb">
+ <legend><?php echo $this->traduire('Abonné sigb'); ?></legend>
+ <table cellspacing="2">
+ <tr>
+ <td class="droite" style="width:150px">Numéro de carte </td>
+ <td class="gauche"><input type="text" name="id_abon" value="<?php echo $this->escape($this->user->getIdabon());?>"/></td>
+ </tr>
+ <tr>
+ <td class="droite">Ordre </td>
+ <td class="gauche"><input type="text" name="ordre" size="3" onkeypress="if (event.keyCode == 13) {javascript:PicToolbarOver( getElementById('menu_item975'), 'menu_item975');this.form.submit();return false;}" value="<?php echo $this->escape($this->user->getOrdreabon());?>"/></td>
+ </tr>
+ <tr>
+ <td class="droite">Abonnement valide - du </td>
+ <td class="gauche"><?php echo formatDate($this->user->getDateDebut(),1);?></td>
+ </tr>
+ <tr>
+ <td class="droite">au </td>
+ <td class="gauche"><?php echo formatDate($this->user->getDateFin(),1);?></td>
+ </tr>
+ </table>
- <input type="hidden" name="id" value="<?php echo $this->user->getId(); ?>" />
- </fieldset>
+ <input type="hidden" name="id" value="<?php echo $this->user->getId(); ?>" />
+ </fieldset>
- <table>
- <tr>
- <td align="right" style="padding-right:5px;"><?php echo $this->bouton('type=V'); ?> </td>
- <td align="left" style="padding-left:5px;"> <?php echo $this->bouton('id=29','picto=del.gif','texte=Annuler','url='.BASE_URL.'/admin/users?z='.$this->id_zone.'&b='.$this->id_bib,'largeur=120px'); ?></td>
- </tr>
- </table>
- </form>
+ <table>
+ <tr>
+ <td align="right" style="padding-right:5px;"><?php echo $this->bouton('type=V'); ?> </td>
+ <td align="left" style="padding-left:5px;"> <?php echo $this->bouton('id=29','picto=del.gif','texte=Annuler','url='.BASE_URL.'/admin/users?z='.$this->id_zone.'&b='.$this->id_bib,'largeur=120px'); ?></td>
+ </tr>
+ </table>
+ </form>
</div>
diff --git a/application/modules/admin/views/scripts/users/index.phtml b/application/modules/admin/views/scripts/users/index.phtml
index 25219f1f6bea558bc84f995a47c0fdabe71bb493..026200b8bef4a1625c7f86d8bb7e657539cf4d19 100644
--- a/application/modules/admin/views/scripts/users/index.phtml
+++ b/application/modules/admin/views/scripts/users/index.phtml
@@ -28,6 +28,7 @@ $acl = new ZendAfi_Acl_AdminControllerRoles();
$ligne=0;
foreach($this->users as $user)
{
+ xdebug_break();
$ligne ++ ;
if ($ligne & 1) $class="first"; else $class="second";
if ($user["ID_SITE"] =="0") $nom_bib="Portail";
diff --git a/public/admin/css/global.css b/public/admin/css/global.css
index 7f3687f442c38cc646ca636ccb2d2a829847e7a4..41b49f061130deb64cc97bb1405047ec1d1f9ff3 100644
--- a/public/admin/css/global.css
+++ b/public/admin/css/global.css
@@ -1035,4 +1035,9 @@ img.article_edit {
#description_editor_switch {
cursor: pointer;
+}
+
+
+div.modules div.pager span {
+ margin:0px 3px;
}
\ No newline at end of file
diff --git a/public/opac/css/global.css b/public/opac/css/global.css
index 80acb677b814e1d499d60ee57d71cf3ffee61336..9b35de79fd135c2808363761578d4b58702f356f 100644
--- a/public/opac/css/global.css
+++ b/public/opac/css/global.css
@@ -2096,4 +2096,4 @@ div.ui-dalog.ajout-panier {
.ui-widget-header {
color: black;
-}
\ No newline at end of file
+}
diff --git a/tests/application/modules/admin/controllers/UsersControllerTest.php b/tests/application/modules/admin/controllers/UsersControllerTest.php
index 416e539c1e3f5e23afcecd9b8da545c0aabe9806..afb92013cac184693ecbe3e0d06635e026b1c4b8 100644
--- a/tests/application/modules/admin/controllers/UsersControllerTest.php
+++ b/tests/application/modules/admin/controllers/UsersControllerTest.php
@@ -187,6 +187,7 @@ class UsersControllerPostMarcusDataTest extends UsersControllerWithMarcusTestCas
'password' => 'tutu',
'nom' => 'Davis',
'prenom' => 'Miles',
+ 'pseudo' => 'Dave',
'mail' => 'mdavis@free.fr',
'role' => '4',
'bib' => '1',
@@ -261,6 +262,10 @@ class UsersControllerPostMarcusDataTest extends UsersControllerWithMarcusTestCas
public function testOrdreabonIsTwo() {
$this->assertEquals(2, $this->marcus->getOrdreabon());
}
+
+ public function testPseudoIsDave() {
+ $this->assertEquals('Dave', $this->marcus->getPseudo());
+ }
}
@@ -270,6 +275,7 @@ class UsersControllerPostMarcusInvalidDataTest extends UsersControllerWithMarcus
'password' => '',
'nom' => 'Davis',
'prenom' => 'Miles',
+ 'pseudo' => 'Dave',
'mail' => 'mdavis@free.fr',
'role' => '4',
'bib' => '0',
@@ -293,6 +299,7 @@ class UsersControllerPostMarcusInvalidDataTest extends UsersControllerWithMarcus
'password' => 'password with more than 50 characters ******************',
'nom' => 'Davis',
'prenom' => 'Miles',
+ 'pseudo' => '',
'mail' => 'mdavis@free.fr',
'role' => '2',
'bib' => '1',
@@ -337,6 +344,7 @@ class UsersControllerPostValidDataWithCommOpsysTest extends UsersControllerWithM
'password' => 'tutu',
'nom' => 'Davis',
'prenom' => 'Miles',
+ 'pseudo' => '',
'mail' => 'mdavis@free.fr',
'role' => '4',
'bib' => '1',
@@ -403,6 +411,10 @@ class UsersControllerAddViewTest extends AbstractControllerTestCase {
$this->assertXPath("//input[@name='telephone'][@value='']");
}
+ public function testPseudoIsEmpty() {
+ $this->assertXPath("//input[@name='pseudo'][@value='']");
+ }
+
}
@@ -421,6 +433,7 @@ class UsersControllerAddPostTest extends UsersControllerWithMarcusTestCase {
'password' => 'tutu',
'nom' => 'Davis',
'prenom' => 'Miles',
+ 'pseudo' => '',
'mail' => 'mdavis@free.fr',
'role' => '4',
'bib' => '1',