Merge branch...

Merge branch 'hotline#21501-permissions-definition-deleted-when-linked-group-deleted' into 'hotline-master'

Hotline#21501 permissions definition deleted when linked group deleted

See merge request !709

VERSIONS_HOTLINE/21501-permissions-definition-deleted

+ - ticket #21501 : Correction du bug supprimant la définition des permissions lors de la suppression d'un groupe d'utilisateur.
\ No newline at end of file

library/Class/UserGroup.php

@@ -30,11 +30,11 @@ class Class_UserGroup extends Storm_Model_Abstract {
 																			'dependents' => 'delete'],
 
 													'user_group_permissions' => ['model' => 'Class_UserGroup_Permission',
-																											 'role' => 'group'],
+																											 'role' => 'group',
+																											 'dependents' => 'delete'],
 
 													'permissions' => ['through' => 'user_group_permissions',
-																						'unique' => true,
-																						'dependents' => 'delete']];
+																						'unique' => true]];
 
 	protected $_belongs_to = ['categorie' => ['model' => 'Class_UserGroupCategorie',
 																						'referenced_in' => 'id_cat'],

tests/library/Class/UserGroupTest.php

@@ -250,4 +250,39 @@ class UserGroupWithCategorieAssociationTest extends UserGroupsTestCase {
 }
 
 
+
+/** @see http://forge.afi-sa.fr/issues/21501 */
+class UserGroupPermissionDeletionTest extends UserGroupsTestCase {
+	public function setUp() {
+		parent::setUp();
+		$permission = $this->fixture('Class_Permission',
+																 ['id' => 23,
+																	'code' => 'VALIDATED',
+																	'module' => 'ARTICLE',
+																	'type' => 'New status',
+																	'sorting' => 101,
+																	'description' => 'Validated']);
+
+		$bib = $this->fixture('Class_Bib',
+													['id' => 0, 'libelle' => 'Portal']);
+
+		$permission->permitTo($this->_stagiaires, $bib);
+		$this->_stagiaires->delete();
+	}
+
+
+	/** @test */
+	public function groupPermissionShouldBeDeleted() {
+		$this->assertNull(Class_UserGroup_Permission::findFirstBy(['id_permission' => 23,
+																															 'id_group' => $this->_stagiaires->getId()]));
+	}
+
+
+	/** @test */
+	public function permissionShouldNotBeDelete() {
+		$this->assertNotNull(Class_Permission::find(23));
+	}
+}
+
+
 ?>
\ No newline at end of file