Fixed adding subgroups with a proper parent group.

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 25cc83f7a7426c63aba7d1bfc5b0d1e50ea9b5a0..e50d9a3ea2fe3a15ea413315c48b86a03a94fa30 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -419,7 +419,7 @@ class ttUser {
     if (!$group_id) $group_id = $this->getActiveGroup();
 
     $sql = "select id, name, description from tt_groups where org_id = $this->org_id".
     if (!$group_id) $group_id = $this->getActiveGroup();
 
     $sql = "select id, name, description from tt_groups where org_id = $this->org_id".

-      " and parent_id = $group_id and status is not null";
+      " and parent_id = $group_id and status is not null order by upper(name)";

     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {


@@ -672,4 +672,37 @@ class ttUser {
     }
     return $user_part;
   }
     }
     return $user_part;
   }

+
+  // setOnBehalfGroup sets on behalf group for the user in both the object and the session.
+  function setOnBehalfGroup($group_id) {
+
+    // Unset things first.
+    $this->behalf_group_id = null;
+    $this->behalf_group_name = null;
+    unset($_SESSION['behalf_group_id']);
+    unset($_SESSION['behalf_group_name']);
+
+    // Do not do anything if we don't have rights.
+    if (!$this->can('manage_subgroups')) return;
+
+    // No need to set if the group is our home group.
+    if ($group_id == $this->group_id) return;
+
+    // No need to set if the subgroup is not valid.
+    if (!$this->isSubgroupValid($group_id)) return;
+
+    // We are good to set on behalf group.
+    $onBehalfGroupName = ttGroupHelper::getGroupName($group_id);
+    $_SESSION['behalf_group_id'] = $group_id;
+    $_SESSION['behalf_group_name'] = $onBehalfGroupName;
+    $this->behalf_group_id = $group_id;
+    $this->behalf_group_name = $onBehalfGroupName;
+
+    // Question remains whether or not we need to adjust on behalf user.
+    // Adjusting for now. Test it and redesign if necessary.
+    unset($_SESSION['behalf_id']);
+    unset($_SESSION['behalf_name']);
+    $this->adjustBehalfId();
+    return;
+  }

 }
 }

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ec0063a316fc73fdb6114e13102b5a59fb9cea86..425975da7d1979ddfa99673354aaed1d71a3f577 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>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.18.27.4504 | 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.27.4505 | 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>
             <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/groups.php b/groups.php
index 279e50834a5857070498f60829fb153d92d1d5d0..172dd3298fe6201accae0a1d55dc0afbff2e9730 100644 (file)
--- a/groups.php
+++ b/groups.php
@@ -43,6 +43,7 @@ if ($request->isPost() && !$user->isGroupValid($request->getParameter('group')))
 
 if ($request->isPost()) {
   $group_id = $request->getParameter('group');
 
 if ($request->isPost()) {
   $group_id = $request->getParameter('group');

+  $user->setOnBehalfGroup($group_id);

 } else {
   $group_id = $user->getActiveGroup();
 }
 } else {
   $group_id = $user->getActiveGroup();
 }