From: Nik Okuntseff Date: Wed, 12 Dec 2018 17:40:36 +0000 (+0000) Subject: Removed group selector from users.php page to keep things simple. X-Git-Tag: timetracker_1.19-1~427 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f9e5e8956921839e6742a85db2067ddc6ef5b2b8;p=timetracker.git Removed group selector from users.php page to keep things simple. --- diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index d2754e7d..d7560f93 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.18.29.4636 | Copyright © Anuko | +  Anuko Time Tracker 1.18.29.4637 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/users.tpl b/WEB-INF/templates/users.tpl index 4faf1249..236475c1 100644 --- a/WEB-INF/templates/users.tpl +++ b/WEB-INF/templates/users.tpl @@ -6,16 +6,6 @@
{if $user->can('manage_users')} - {if $group_dropdown} -{$forms.usersForm.open} {* usersForm consists only of one dropdown group control *} - - - - -
{$i18n.label.group}: {$forms.usersForm.group.control}
-{$forms.usersForm.close} - {/if} - {if $inactive_users} diff --git a/users.php b/users.php index 77b7e552..d19ba7de 100644 --- a/users.php +++ b/users.php @@ -36,36 +36,8 @@ 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->getGroup(); -} - -$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); @@ -88,7 +60,6 @@ if ($uncompleted_indicators) { $smarty->assign('uncompleted_indicators', true); } -$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'));
{$i18n.form.users.active_users}