Resuming refactoring for subgroup support.

diff --git a/WEB-INF/templates/clients.tpl b/WEB-INF/templates/clients.tpl
index a31a8cd..2e8b2b8 100644 (file)
--- a/WEB-INF/templates/clients.tpl
+++ b/WEB-INF/templates/clients.tpl
@@ -6,6 +6,15 @@
   <tr>
     <td valign="top">
 {if $user->can('manage_clients')}
+  {if $group_dropdown}
+{$forms.clientsForm.open} {* clientsForm consists only of one dropdown group control *}
+      <table width="100%">
+        <tr>
+          <td align="center">{$i18n.label.group}: {$forms.clientsForm.group.control}</td>
+        </tr>
+      </table>
+{$forms.clientsForm.close}
+  {/if}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
   {if $inactive_clients}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.clients.active_clients}</td></tr>

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 071a29a..1a9987d 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.18.29.4556 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.29.4557 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/clients.php b/clients.php
index 6bf4809..ca83efd 100644 (file)
--- a/clients.php
+++ b/clients.php
@@ -39,13 +39,45 @@ if (!$user->isPluginEnabled('cl')) {
   header('Location: feature_disabled.php');
   exit();
 }
+if ($request->isPost()) {
+  $groupChanged = $request->getParameter('group_changed'); // Reused in multiple places below.
+  if ($groupChanged && !($user->can('manage_subgroups') && $user->isGroupValid($request->getParameter('group')))) {
+    header('Location: access_denied.php'); // Group changed, but no rght or wrong group id.
+    exit();
+  }
+}
+
+// Determine group for which we display this page.
+if ($request->isPost() && $groupChanged) {
+  $group_id = $request->getParameter('group');
+  $user->setOnBehalfGroup($group_id);
+} else {
+  $group_id = $user->getGroup();
+}
+
+$form = new Form('clientsForm');
+if ($user->can('manage_subgroups')) {
+  $groups = $user->getGroupsForDropdown();
+  if (count($groups) > 1) {
+    $form->addInput(array('type'=>'combobox',
+      'onchange'=>'document.clientsForm.group_changed.value=1;document.clientsForm.submit();',
+      'name'=>'group',
+      'style'=>'width: 250px;',
+      'value'=>$group_id,
+      'data'=>$groups,
+      'datakeys'=>array('id','name')));
+    $form->addInput(array('type'=>'hidden','name'=>'group_changed'));
+    $smarty->assign('group_dropdown', 1);
+  }
+}
 
 if($user->can('manage_clients')) {
-  $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
-  $inactive_clients = ttTeamHelper::getInactiveClients($user->group_id, true);
+  $active_clients = ttTeamHelper::getActiveClients($user->getGroup(), true);
+  $inactive_clients = ttTeamHelper::getInactiveClients($user->getGroup(), true);
 } else
   $active_clients = $user->getAssignedClients();
 
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('active_clients', $active_clients);
 $smarty->assign('inactive_clients', $inactive_clients);
 $smarty->assign('title', $i18n->get('title.clients'));