X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=users.php;h=4afd5521f2cd802d8d6a64f5434c52ed591792b8;hb=6cdff5151bba8cd6c8bd1bb90b1b2c18457ecb88;hp=af5389021e53487906edd52b40d94a9da217e35f;hpb=11bfec0ff88b649a934556e8b4812d65715c7509;p=timetracker.git

diff --git a/users.php b/users.php
index af538902..4afd5521 100644
--- a/users.php
+++ b/users.php
@@ -28,7 +28,6 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper');
 import('ttTimeHelper');
 import('ttRoleHelper');
 
@@ -37,8 +36,36 @@ if (!(ttAccessAllowed('view_users') || ttAccessAllowed('manage_users'))) {
   header('Location: access_denied.php');
   exit();
 }
+if ($request->isPost() && !$user->isGroupValid($request->getParameter('group'))) {
+  header('Location: access_denied.php'); // Wrong group id in post.
+  exit();
+}
+// Note: we don't use "manage_subgroups" in access check, because when user cannot
+// "manage_users" or "view_users" they do not belong here.
 // End of access checks.
 
+if ($request->isPost()) {
+  $group_id = $request->getParameter('group');
+  $user->setOnBehalfGroup($group_id);
+} else {
+  $group_id = $user->getActiveGroup();
+}
+
+$form = new Form('usersForm');
+if ($user->can('manage_subgroups')) {
+  $groups = $user->getGroupsForDropdown();
+  if (count($groups) > 1) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'this.form.submit();',
+      'name'=>'group',
+      'style'=>'width: 250px;',
+      'value'=>$group_id,
+      'data'=>$groups,
+      'datakeys'=>array('id','name')));
+    $smarty->assign('group_dropdown', 1);
+  }
+}
+
 // Prepare a list of active users.
 if ($user->can('view_users'))
   $options = array('status'=>ACTIVE,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
@@ -52,7 +79,7 @@ if($user->can('manage_users')) {
   $inactive_users = $user->getUsers($options);
 }
 
-// Check if the team is set to show indicators for uncompleted time entries.
+// Check if the group is set to show indicators for uncompleted time entries.
 if ($user->uncompleted_indicators) {
   // Check each active user if they have an uncompleted time entry.
   foreach ($active_users as $key => $user) {
@@ -60,6 +87,7 @@ if ($user->uncompleted_indicators) {
   }
 }
 
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('active_users', $active_users);
 $smarty->assign('inactive_users', $inactive_users);
 $smarty->assign('title', $i18n->get('title.users'));