Adjusted task_add.php and task_edit.php to operate with subgroups.

[timetracker.git] / WEB-INF / lib / ttUser.class.php

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index ccd1f96..2da8f98 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -166,16 +166,26 @@ class ttUser {
     }
   }
 
+  // The getGroup returns group id on behalf of which the current user is operating.
+   function getGroup() {
+    return ($this->behalfGroup ? $this->behalfGroup->id : $this->group_id);
+  }
+
+  // getDecimalMark returns decimal mark for active group.
+  function getDecimalMark() {
+    return ($this->behalfGroup ? $this->behalfGroup->decimal_mark : $this->decimal_mark);
+  }
+
+  // getTrackingMode returns tracking mode for active group.
+  function getTrackingMode() {
+    return ($this->behalfGroup ? $this->behalfGroup->tracking_mode : $this->tracking_mode);
+  }
+
   // The getActiveUser returns user id on behalf of whom the current user is operating.
   function getActiveUser() {
     return ($this->behalf_id ? $this->behalf_id : $this->id);
   }
 
-  // The getActiveGroup returns group id on behalf of which the current user is operating.
-  function getActiveGroup() {
-    return ($this->behalf_group_id ? $this->behalf_group_id : $this->group_id);
-  }
-
   // can - determines whether user has a right to do something.
   function can($do_something) {
     return in_array($do_something, $this->rights);
@@ -313,7 +323,7 @@ class ttUser {
   function getUsers($options) {
     $mdb2 = getConnection();
 
-    $group_id = $this->getActiveGroup();
+    $group_id = $this->getGroup();
     $org_id = $this->org_id;
 
     $skipClients = !isset($options['include_clients']);
@@ -378,12 +388,27 @@ class ttUser {
   //   - The entire stack of groups all the way down to current on behalf group.
   //   - All immediate children of the current on behalf group.
   // This allows user to navigate easily to home group, anything in between, and 1 level below.
+  //
+  // Note 1: group dropdown is, by design, to be placed on all pages where "relevant",
+  // such as users.php, projects.php, tasks.php, etc. But some features may be disabled
+  // in some groups. We should check for feature availability on group change
+  // in post and redirect to feature_disabled.php when this happens.
+  // This will allow us to keep dropdown content consistent on all pages.
+  // Filtering content of the dropdown does not seem right.
+  //
+  // Note 2: Menu should display according to $user home group settings.
+  //         Pages, should look according to $user->behalfGroup settings (if set).
+  //         For example, if home group allows tasks, menu should display Tasks,
+  //         even when we are on behalf of a subgroup without tasks.
+  //
+  // Note 3: Language of all pages should be as in $user home group even when
+  //         subgroups have a different language.
   function getGroupsForDropdown() {
     $mdb2 = getConnection();
 
     // Start with subgroups.
     $groups = array();
-    $group_id = $this->getActiveGroup();
+    $group_id = $this->getGroup();
     $sql = "select id, name from tt_groups where org_id = $this->org_id and parent_id = $group_id and status = 1";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
@@ -426,7 +451,7 @@ class ttUser {
   function getSubgroups($group_id = null) {
     $mdb2 = getConnection();
 
-    if (!$group_id) $group_id = $this->getActiveGroup();
+    if (!$group_id) $group_id = $this->getGroup();
 
     $sql = "select id, name, description from tt_groups where org_id = $this->org_id".
       " and parent_id = $group_id and status is not null order by upper(name)";
@@ -445,7 +470,7 @@ class ttUser {
     if (!$this->can('manage_users')) return false;
 
     $mdb2 = getConnection();
-    $group_id = $this->getActiveGroup();
+    $group_id = $this->getGroup();
     $org_id = $this->org_id;
 
     $sql =  "select u.id, u.name, u.login, u.role_id, u.client_id, u.status, u.rate, u.email from tt_users u".
@@ -527,7 +552,7 @@ class ttUser {
     if ($group_id && !$this->isGroupValid($group_id)) return false;
 
     $mdb2 = getConnection();
-    if (!$group_id) $group_id = $this->getActiveGroup();
+    if (!$group_id) $group_id = $this->getGroup();
 
     if (isset($fields['name'])) $name_part = ', name = '.$mdb2->quote($fields['name']);
     if (isset($fields['description'])) $description_part = ', description = '.$mdb2->quote($fields['description']);
@@ -572,7 +597,7 @@ class ttUser {
     if (!$user_details) return false;
 
     $mdb2 = getConnection();
-    $group_id = $this->getActiveGroup();
+    $group_id = $this->getGroup();
     $org_id = $this->org_id;
 
     // Mark user to project binds as deleted.
@@ -698,6 +723,7 @@ class ttUser {
     $this->behalf_group_name = null;
     $this->behalf_id = null;
     $this->behalf_name = null;
+    unset($this->behalfGroup);
     unset($_SESSION['behalf_group_id']);
     unset($_SESSION['behalf_group_name']);
     unset($_SESSION['behalf_id']);