From 21a88534ce3aeaf84ea76f4fef0581f2eec037b6 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Tue, 4 Dec 2018 15:31:07 +0000 Subject: [PATCH] Removed group selector from clients.php as design approach changed. --- WEB-INF/templates/clients.tpl | 9 --------- WEB-INF/templates/footer.tpl | 2 +- clients.php | 33 +-------------------------------- 3 files changed, 2 insertions(+), 42 deletions(-) diff --git a/WEB-INF/templates/clients.tpl b/WEB-INF/templates/clients.tpl index 2e8b2b82..a31a8cd0 100644 --- a/WEB-INF/templates/clients.tpl +++ b/WEB-INF/templates/clients.tpl @@ -6,15 +6,6 @@ {if $user->can('manage_clients')} - {if $group_dropdown} -{$forms.clientsForm.open} {* clientsForm consists only of one dropdown group control *} - - - - -
{$i18n.label.group}: {$forms.clientsForm.group.control}
-{$forms.clientsForm.close} - {/if} {if $inactive_clients} diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index c5ff71ca..a4ddf7cc 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
{$i18n.form.clients.active_clients}
-
 Anuko Time Tracker 1.18.29.4580 | Copyright © Anuko | +  Anuko Time Tracker 1.18.29.4581 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/clients.php b/clients.php index cc08f9a3..a299d306 100644 --- a/clients.php +++ b/clients.php @@ -40,37 +40,7 @@ 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); - } -} +// End of access checks. if($user->can('manage_clients')) { $active_clients = ttGroupHelper::getActiveClients(true); @@ -78,7 +48,6 @@ if($user->can('manage_clients')) { } 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')); -- 2.20.1