Edition des utilisateur : Affichage des groupes

git-svn-id: http://afi-forge.afi-sa.fr/svn/opacce/trunk@2725 e3cc70dd-a52f-4065-8a26-0e09943c8c5c

application/modules/admin/views/scripts/users/_form.phtml

@@ -45,6 +45,22 @@
 
 	  </td>
 	</tr>
+
+	<tr>
+	  <td class="droite"><?php echo $this->traduire('Groupe'); ?>&nbsp;</td>
+	  <td class="gauche">
+   <?php $groups=[];
+	 foreach ($this->user->getUserGroups() as $group) {
+		 $groups[]= $group->getLibelle();
+	  } 
+   echo implode($groups,',');
+
+?>
+
+	  </td>
+	</tr>
+
+
 	<tr id="option_bib">
 	  <td class="droite">Bibliothèque&nbsp;</td>
 	  <td class="gauche">

tests/application/modules/admin/controllers/UserGroupControllerTest.php

@@ -327,8 +327,6 @@ class Admin_UserGroupControllerEditMembersGroupAbonnesSIGB extends Admin_UserGro
 }
 
 
-
-
 class Admin_UserGroupControllerEditGroupModerateursBibTest extends Admin_UserGroupControllerTestCase {
 	public function setUp() {
 		parent::setUp();

tests/application/modules/admin/controllers/UsersControllerTest.php

@@ -23,6 +23,12 @@ require_once 'AbstractControllerTestCase.php';
 abstract class UsersControllerWithMarcusTestCase extends AbstractControllerTestCase {
 	public function setUp() {
 		parent::setUp();
+		$group_vodeclic = Class_UserGroup::newInstanceWithId('20', ['libelle' => 'Multimedia',
+																																				'rights_token' => Class_UserGroup::RIGHT_ACCES_VODECLIC]);
+
+		$group_referent = Class_UserGroup::newInstanceWithId('20', ['libelle' => 'Referent',
+																																				'rights_token' => Class_UserGroup::RIGHT_USER_DOMAINES_SUPPRESSION_LIMIT]);
+		
 		$this->marcus = Class_Users::getLoader()
 			->newInstanceWithId(10)
 			->setPrenom('Marcus')
@@ -43,6 +49,7 @@ abstract class UsersControllerWithMarcusTestCase extends AbstractControllerTestC
 			->setAdresse('34 avenue Funk')
 			->setCodePostal('99000')
 			->setVille('Jazz City')
+			->setUserGroups([$group_vodeclic,$group_referent])
 			->setIntBib(Class_IntBib::newInstanceWithId(1, ['comm_sigb' => 0]));
 
 		$this->assertTrue($this->marcus->isValid());
@@ -106,6 +113,11 @@ class UsersControllerEditMarcusTest extends UsersControllerWithMarcusTestCase {
 		$this->assertXPath("//input[@name='prenom'][@value='Marcus']");
 	}
 
+
+	public function testGroupesAreMultimediaAndReferent() {
+		$this->assertXPathContentContains("//td","Multimedia,Referent",$this->_response->getBody());
+	}
+
 	public function testSelectedRoleIsAbonneSIGB() {
 		$this->assertXPathContentContains("//select[@name='role']/option[@value='2'][@selected='selected']",
 																			'abonné identifié SIGB');