Adjusted Work units plugin to count only bullable units.

[timetracker.git] / mobile / users.php

diff --git a/mobile/users.php b/mobile/users.php
index c3c6a98..d0b5d21 100644 (file)
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -31,30 +31,31 @@ import('form.Form');
 import('ttTeamHelper');
 import('ttTimeHelper');
 
-// Access check.
-if (!ttAccessCheck(right_data_entry)) {
+// Access checks.
+if (!(ttAccessAllowed('view_users') || ttAccessAllowed('manage_users'))) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 // Get users.
 $active_users = ttTeamHelper::getActiveUsers(array('getAllFields'=>true));
-if($user->canManageTeam()) {
+if($user->can('manage_users')) {
   $can_delete_manager = (1 == count($active_users));
-  $inactive_users = ttTeamHelper::getInactiveUsers($user->team_id, true);
+  $inactive_users = ttTeamHelper::getInactiveUsers($user->group_id, true);
 }
 
-// Check each active user if they have an uncompleted time entry.
-foreach ($active_users as $key => $user) {
-  // Turn value from database into boolean.
-  $has_uncompleted_entry = boolval(ttTimeHelper::getUncompleted($user['id']));
-  // Add to current user in $active_users array.
-  $active_users[$key]['has_uncompleted_entry'] = $has_uncompleted_entry;
+// 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) {
+    $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($user['id']);
+  }
 }
 
 $smarty->assign('active_users', $active_users);
 $smarty->assign('inactive_users', $inactive_users);
 $smarty->assign('can_delete_manager', $can_delete_manager);
-$smarty->assign('title', $i18n->getKey('title.users'));
+$smarty->assign('title', $i18n->get('title.users'));
 $smarty->assign('content_page_name', 'mobile/users.tpl');
 $smarty->display('mobile/index.tpl');