Work in progress on subgroups. Made user list population more robust.

[timetracker.git] / time.php

diff --git a/time.php b/time.php
index 5307d8b2af2fcb21571756a5675c77e3a2acb0cb..6d62fb691e2779e94e906194b496fc3389d7f278 100644 (file)
--- a/time.php
+++ b/time.php
@@ -124,10 +124,11 @@ if ($user->can('manage_subgroups')) {
 } // SUBGROUP_DEBUG
 
 if ($user->can('track_time')) {
+  $rank = $user->getMaxRankForGroup($on_behalf_group_id);
   if ($user->can('track_own_time'))
-    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1,'include_self'=>true,'self_first'=>true);
+    $options = array('group_id'=>$on_behalf_group_id,'status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
   else
-    $options = array('status'=>ACTIVE,'max_rank'=>$user->rank-1);
+    $options = array('group_id'=>$on_behalf_group_id,'status'=>ACTIVE,'max_rank'=>$rank);
   $user_list = $user->getUsers($options);
   if (count($user_list) >= 1) {
     $form->addInput(array('type'=>'combobox',