Rewrote group dropdown fill function to include the entire tree.

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 62c786ce5832c52ac626cce582751bced1c7c93b..8f9578dd82072fdbdabc1bfc94f057aad8bdb5c9 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -560,6 +560,38 @@ class ttUser {
     return $groups;
   }
 
+  // getGroupsForDropdown2 obtains an array of groups to populate the "Group" dropdown.
+  // It consists of the entire tree starting from user home group down.
+  // Group name is prefixed with additional characters to indicate subgroups level.
+  function getGroupsForDropdown2() {
+    global $user;
+
+    // Start with user home group.
+    $groups = array();
+    $subgroup_level = 0;
+    $group_id = $user->group_id;
+
+    $this->addGroup($groups, $group_id, $subgroup_level);
+    return $groups;
+  }
+
+  // addGroup is a recursive function to populate a tree of groups.
+  function addGroup(&$groups, $group_id, $subgroup_level) {
+    // Add indentation markup to indicate subdirectory level.
+    for ($i = 0; $i < $subgroup_level; $i++) {
+      $name .= '🛑'; // Unicode stop sign.
+    }
+    if ($subgroup_level) $name .= ' '; // Add an extra space.
+    $name .= ttGroupHelper::getGroupName($group_id);
+
+    $groups[] = array('id'=>$group_id, 'name'=>$name);
+
+    $subgroups = $this->getSubgroups($group_id);
+    foreach($subgroups as $subgroup) {
+      $this->addGroup($groups, $subgroup['id'], $subgroup_level+1);
+    }
+  }
+
   // getSubgroups obtains a list of immediate subgroups.
   function getSubgroups($group_id = null) {
     $mdb2 = getConnection();

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a3ce2484154003d3c92fd452c8ede11e36ecfacd..14944213f814b6d64a40069387a1599810c21268 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>
-          <td align="center">&nbsp;Anuko Time Tracker 1.19.4.5007 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.19.4.5008 | 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>

diff --git a/group_edit.php b/group_edit.php
index 1df99a1c534806a847042cd942988c3521dccfbb..77b464b905b2ced293438ced06153681bb954af1 100644 (file)
--- a/group_edit.php
+++ b/group_edit.php
@@ -68,7 +68,7 @@ if ($request->isPost() && $groupChanged) {
  $user->setOnBehalfGroup($group_id);
 }
 
-$groups = $user->getGroupsForDropdown();
+$groups = $user->getGroupsForDropdown2();
 $group = ttGroupHelper::getGroupAttrs($group_id);
 $config = $user->getConfigHelper();
 

diff --git a/groups.php b/groups.php
index f335153ce09c671bb82f3244f660213f3fc0fbac..449bd636066805eb4df057b4eef646322e547dce 100644 (file)
--- a/groups.php
+++ b/groups.php
@@ -49,7 +49,7 @@ if ($request->isPost()) {
 }
 
 $form = new Form('subgroupsForm');
-$groups = $user->getGroupsForDropdown();
+$groups = $user->getGroupsForDropdown2();
 if (count($groups) > 1) {
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'this.form.submit();',