From: Nik Okuntseff <support@anuko.com>
Date: Tue, 20 Nov 2018 12:51:18 +0000 (+0000)
Subject: Introduced status field in tt_custom_field_options for consistency.
X-Git-Tag: timetracker_1.19-1~600
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=94081b97e54440c0d7b1b5b3f2faf0db4f0c4687;p=timetracker.git

Introduced status field in tt_custom_field_options for consistency.
---

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 405a939b..02b73555 100644
--- 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.18.23.4471 | 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.24.4472 | 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/dbinstall.php b/dbinstall.php
index d0ccbe33..6818e0d3 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -957,7 +957,7 @@ if ($_POST) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11822"]) {
+  if ($_POST["convert11797to11824"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1035,6 +1035,7 @@ if ($_POST) {
     setChange("UPDATE `tt_custom_fields` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') set org_id = group_id where org_id is null");
     setChange("update `tt_custom_field_options` cfo inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') inner join `tt_custom_fields` cf on cf.id = cfo.field_id set cfo.group_id = cf.group_id, cfo.org_id = cf.org_id where cfo.org_id is null");
     setChange("update `tt_custom_field_log` cfl inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.23') inner join `tt_custom_fields` cf on cf.id = cfl.field_id set cfl.group_id = cf.group_id, cfl.org_id = cf.org_id where cfl.org_id is null");
+    setChange("ALTER TABLE `tt_custom_field_options` ADD `status` tinyint(4) default '1' after `value`");
   }
 
   if ($_POST["cleanup"]) {
@@ -1082,7 +1083,7 @@ if ($_POST) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.22)</b>
+    <td width="80%"><b>Create database structure (v1.18.24)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1127,8 +1128,8 @@ if ($_POST) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.22)</td>
-    <td><input type="submit" name="convert11797to11822" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.24)</td>
+    <td><input type="submit" name="convert11797to11824" value="Update"></td>
   </tr>
 </table>
 
diff --git a/mysql.sql b/mysql.sql
index 0bbf15d4..0ddf3bfa 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -387,6 +387,7 @@ CREATE TABLE `tt_custom_field_options` (
   `org_id` int(11) default NULL,           # organization id
   `field_id` int(11) NOT NULL,             # custom field id
   `value` varchar(32) NOT NULL default '', # option value
+  `status` tinyint(4) default 1,           # option status
   PRIMARY KEY  (`id`)
 );
 
@@ -486,4 +487,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.23', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.24', now()); # TODO: change when structure changes.