Department admin: allow handling of user requests in relevant departm…

…ents

--HG--
branch : 3.12

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

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) {