Fixed export-import to include group descriptions.

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 54b8aaa11f6e46a8dd8a2fd2846318406eb82e1a..9490f075743065158caf124e4993c274c6bc7600 100644 (file)
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -123,6 +123,7 @@ class ttGroupExportHelper {
     // Write group info.
     $group = $this->getGroupAttrs();
     $group_part = "<group name=\"".htmlspecialchars($group['name'])."\"";
     // Write group info.
     $group = $this->getGroupAttrs();
     $group_part = "<group name=\"".htmlspecialchars($group['name'])."\"";

+    $group_part .= " description=\"".htmlspecialchars($group['description'])."\"";

     $group_part .= " currency=\"".htmlspecialchars($group['currency'])."\"";
     $group_part .= " decimal_mark=\"".$group['decimal_mark']."\"";
     $group_part .= " lang=\"".$group['lang']."\"";
     $group_part .= " currency=\"".htmlspecialchars($group['currency'])."\"";
     $group_part .= " decimal_mark=\"".$group['decimal_mark']."\"";
     $group_part .= " lang=\"".$group['lang']."\"";

diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php
index a14d9714b737a8779ffbb9d69488f30b08f77d28..124b035b0a4c01907e6e221524254abf0ded328c 100644 (file)
--- a/WEB-INF/lib/ttOrgImportHelper.class.php
+++ b/WEB-INF/lib/ttOrgImportHelper.class.php
@@ -109,6 +109,7 @@ class ttOrgImportHelper {
           'parent_id' => $this->current_parent_group_id,
           'org_id' => $this->org_id,
           'name' => $attrs['NAME'],
           'parent_id' => $this->current_parent_group_id,
           'org_id' => $this->org_id,
           'name' => $attrs['NAME'],

+          'description' => $attrs['DESCRIPTION'],

           'currency' => $attrs['CURRENCY'],
           'decimal_mark' => $attrs['DECIMAL_MARK'],
           'lang' => $attrs['LANG'],
           'currency' => $attrs['CURRENCY'],
           'decimal_mark' => $attrs['DECIMAL_MARK'],
           'lang' => $attrs['LANG'],


@@ -655,7 +656,7 @@ class ttOrgImportHelper {
     global $i18n;
     $mdb2 = getConnection();
 
     global $i18n;
     $mdb2 = getConnection();
 

-    $columns = '(parent_id, org_id, name, currency, decimal_mark, lang, date_format, time_format'.
+    $columns = '(parent_id, org_id, name, description, currency, decimal_mark, lang, date_format, time_format'.

       ', week_start, tracking_mode, project_required, task_required, record_type, bcc_email'.
       ', allow_ip, password_complexity, plugins, lock_spec'.
       ', workday_minutes, config, created, created_ip, created_by)';
       ', week_start, tracking_mode, project_required, task_required, record_type, bcc_email'.
       ', allow_ip, password_complexity, plugins, lock_spec'.
       ', workday_minutes, config, created, created_ip, created_by)';


@@ -664,6 +665,7 @@ class ttOrgImportHelper {
     $values .= $mdb2->quote($fields['parent_id']);
     $values .= ', '.$mdb2->quote($fields['org_id']);
     $values .= ', '.$mdb2->quote(trim($fields['name']));
     $values .= $mdb2->quote($fields['parent_id']);
     $values .= ', '.$mdb2->quote($fields['org_id']);
     $values .= ', '.$mdb2->quote(trim($fields['name']));

+    $values .= ', '.$mdb2->quote(trim($fields['description']));

     $values .= ', '.$mdb2->quote(trim($fields['currency']));
     $values .= ', '.$mdb2->quote($fields['decimal_mark']);
     $values .= ', '.$mdb2->quote($fields['lang']);
     $values .= ', '.$mdb2->quote(trim($fields['currency']));
     $values .= ', '.$mdb2->quote($fields['decimal_mark']);
     $values .= ', '.$mdb2->quote($fields['lang']);

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 814be7981018af230c3fc1efada419ea926dae3f..4829793a8ab2c2e82e74dfd98e12cb06eebe8664 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.4498 | 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.4499 | 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>