dev#189214: Add managed libraries select in users edit/add form

application/modules/admin/controllers/ProfilController.php

@@ -60,14 +60,13 @@ class Admin_ProfilController extends ZendAfi_Controller_Action {
 
 
   public function indexAction() {
-
     $user = Class_Users::getIdentity();
 
-    $profils = $this->_managed_libraries
-      ? Class_Profil::findByZoneAndBibs($this->id_zone,
-                                        $this->_managed_libraries)
-      : Class_Profil::findAllByZoneAndBib($this->id_zone,
-                                          $this->id_bib);
+    $profils = ($user->isModoPortailOrMore())
+      ? Class_Profil::findAllByZoneAndBib($this->id_zone,
+                                          $this->id_bib)
+      : Class_Profil::findByZoneAndBibs($this->id_zone,
+                                        $user->managedLibraryIds());
 
     $profils_by_bib = array();
     foreach ($profils as $profil) {
@@ -75,8 +74,9 @@ class Admin_ProfilController extends ZendAfi_Controller_Action {
       if ($profil->hasParentProfil())
         continue;
 
-      if (($user->getRoleLevel() <= ZendAfi_Acl_AdminControllerRoles::MODO_PORTAIL) and
-          ! $this->_isProfilAllowedForUser($profil, $user))
+      if (($user->getRoleLevel() <= ZendAfi_Acl_AdminControllerRoles::MODO_PORTAIL)
+          and
+          ! $user->canManageLibrary($profil->getBib()))
         continue;
 
       if ($profil->isInPortail()) {
@@ -99,14 +99,6 @@ class Admin_ProfilController extends ZendAfi_Controller_Action {
   }
 
 
-  protected function _isProfilAllowedForUser(Class_Profil $profil, Class_Users $user) :bool
-  {
-    return $this->managed_libraries
-      ? $user->canManageLibrary($profil->getBib())
-      : $profil->getIdSite() == $user->getIdSite();
-  }
-
-
   public function proprietesAction() {
     $this->view->titre = $this->_("Propriétés des modules: %s", $this->_profil->getLibelle());