From 55b7f3ff4452127ebc957776be5da8d9a725456c Mon Sep 17 00:00:00 2001
From: Alexandros Diamantidis <adia@noc.uoa.gr>
Date: Fri, 22 Oct 2021 09:56:43 +0300
Subject: [PATCH] Department admin: allow handling of user requests in relevant
 departments

--HG--
branch : 3.12
---
 modules/admin/listreq.php      | 10 +++++-----
 modules/admin/newuseradmin.php |  5 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/modules/admin/listreq.php b/modules/admin/listreq.php
index 2ceaf45ac9..12544f29ef 100644
--- a/modules/admin/listreq.php
+++ b/modules/admin/listreq.php
@@ -19,7 +19,7 @@
  *                  e-mail: info@openeclass.org
  * ======================================================================== */
 
-$require_usermanage_user = TRUE;
+$require_usermanage_user = true;
 
 require_once '../../include/baseTheme.php';
 require_once 'include/sendMail.inc.php';
@@ -54,8 +54,8 @@
 
 $head_content .= "<script type='text/javascript'>
         $(document).ready(function() {
-            $('#requests_table').DataTable ({       
-                'columns': [ $columns ],                         
+            $('#requests_table').DataTable ({
+                'columns': [ $columns ],
                 'sPaginationType': 'full_numbers',
                 'bAutoWidth': true,
                 'searchDelay': 1000,
@@ -109,8 +109,8 @@
 // department admin additional query where clause
 $depqryadd = '';
 if (isDepartmentAdmin()) {
-    $deps = $user->getDepartmentIds($uid);
-    $depqryadd = ' AND faculty_id IN (' . implode(', ', $deps) . ')';
+    $subtrees = $tree->buildSubtrees($user->getAdminDepartmentIds($uid));
+    $depqryadd = ' AND faculty_id IN (' . implode(', ', $subtrees) . ')';
 }
 
 // Display Actions Toolbar
diff --git a/modules/admin/newuseradmin.php b/modules/admin/newuseradmin.php
index 25a0cfd49f..d29e2f8322 100644
--- a/modules/admin/newuseradmin.php
+++ b/modules/admin/newuseradmin.php
@@ -339,12 +339,11 @@
     'params' => 'name="department"',
     'defaults' => $depid,
     'tree' => null,
-    'where' => "AND node.allow_user = true",
     'multiple' => false);
 if (isDepartmentAdmin()) {
-    $nodePickerParams['allowables'] = $user->getDepartmentIds($uid);
+    $nodePickerParams['allowables'] = $user->getAdminDepartmentIds($uid);
 }
-list($tree_js, $tree_html) = $tree->buildNodePicker($nodePickerParams);
+list($tree_js, $tree_html) = $tree->buildUserNodePicker($nodePickerParams);
 $head_content .= $tree_js;
 
 if ($eclass_method_unique) {