Merge branch...

Merge branch 'hotline#62667_impossible_d_attribuer_un_panier_a_un_domaine_pour_les_administrateurs_bibliotheque' into 'hotline-master'

hotline #62667 fix right for adding basket to a domain with rights on domain for library writer

See merge request !2249

VERSIONS_HOTLINE/62667

+ - ticket #62667 : correction de l'impossibilité d'attribuer un panier à un domaine pour les administrateurs bibliothèque
\ No newline at end of file

library/ZendAfi/Acl/AdminControllerGroup.php

@@ -27,7 +27,9 @@ class ZendAfi_Acl_AdminControllerGroup {
     $_mapping = ['activity' => Class_UserGroup::RIGHT_DIRIGER_ACTIVITY,
                  'catalogue' => [Class_UserGroup::RIGHT_USER_DOMAINES_SUPPRESSION_LIMIT,
                                  Class_UserGroup::RIGHT_USER_DOMAINES_TOTAL_ACCESS],
-                 'catalogue/domaines' => Class_UserGroup::RIGHT_USER_INDEX_ARTICLES,
+                 'catalogue/domaines' => [Class_UserGroup::RIGHT_USER_DOMAINES_SUPPRESSION_LIMIT,
+                                          Class_UserGroup::RIGHT_USER_DOMAINES_TOTAL_ACCESS,
+                                          Class_UserGroup::RIGHT_USER_INDEX_ARTICLES],
                  'sito' => Class_UserGroup::RIGHT_USER_SITOTHEQUE,
                  'modo' => Class_UserGroup::RIGHT_USER_MODO,
                  'modo/membreview' => Class_UserGroup::RIGHT_USER_INSCRIPTIONS,

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

@@ -1675,7 +1675,7 @@ class CatalogueControllerRenamingTest extends AbstractControllerTestCase {
 
 
 
-abstract class Admin_CatalogueControllerActionDomainesTestCase extends AbstractControllerTestCase {
+class Admin_CatalogueControllerActionDomainesTestCase extends AbstractControllerTestCase {
   protected $_storm_default_to_volatile = true;
 
 
@@ -1700,41 +1700,36 @@ abstract class Admin_CatalogueControllerActionDomainesTestCase extends AbstractC
 
     ZendAfi_Auth::getInstance()->logUser($valerie);
   }
-}
-
-
 
-class Admin_CatalogueControllerActionDomainesWithNoRightTest  extends Admin_CatalogueControllerActionDomainesTestCase {
-  public function setUp() {
-    parent::setUp();
-    $this->dispatch('/admin/catalogue/domaines', true);
-  }
 
 
   /** @test */
-  public function shouldRedirect() {
+  public function withNoRightsShouldRedirect() {
+    $this->dispatch('/admin/catalogue/domaines', true);
     $this->assertRedirect();
   }
-}
 
 
-
-
-class Admin_CatalogueControllerActionDomainesWithIndexRightTest  extends Admin_CatalogueControllerActionDomainesTestCase {
-  public function setUp() {
-    parent::setUp();
-
+  /** @test */
+  public function withRightsOnArticleShouldNotRedirect() {
     Class_UserGroup::find(5)->setRights([
-                                         class_UserGroup::RIGHT_USER_ACCES_ARTICLES,
+                                         Class_UserGroup::RIGHT_USER_ACCES_ARTICLES,
                                          Class_UserGroup::RIGHT_USER_INDEX_ARTICLES,
                                          ]);
 
     $this->dispatch('/admin/catalogue/domaines', true);
+    $this->assertNotRedirect();
   }
 
 
+
   /** @test */
-  public function shouldNotRedirect() {
+  public function withRightsOnDomainShouldNotRedirect() {
+    Class_UserGroup::find(5)->setRights([
+                                         Class_UserGroup::RIGHT_USER_DOMAINES_TOTAL_ACCESS,
+                                         ]);
+
+    $this->dispatch('/admin/catalogue/domaines', true);
     $this->assertNotRedirect();
   }
-}
\ No newline at end of file
+}