X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=dbinstall.php;h=5baff57e63da8bb8eb4cfed8a1dc4d70a346fbf8;hb=ee95ed0e72258b76ed0280f04d6846d802aefa12;hp=097d2abe5626180c7fa300774661b81e8c0bf1eb;hpb=85329fe7459e5892082de3bd40459e7dfdb36f11;p=timetracker.git

diff --git a/dbinstall.php b/dbinstall.php
index 097d2abe..5baff57e 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -956,11 +956,18 @@ if ($_POST) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11800"]) {
+  if ($_POST["convert11797to11805"]) {
     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`");
     setChange("UPDATE `tt_site_config` SET param_value = '1.18.00', modified = now() where param_name = 'version_db' and param_value = '1.17.97'");
+    setChange("create index log_idx on tt_custom_field_log(log_id)");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.05', modified = now() where param_name = 'version_db' and param_value = '1.18.00'");
+    setChange("UPDATE `tt_groups` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.05') set org_id = id where org_id is null");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.06', modified = now() where param_name = 'version_db' and param_value = '1.18.05'");
+    setChange("ALTER TABLE `tt_users` ADD `org_id` int(11) default NULL AFTER `group_id`");
+    setChange("UPDATE `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.06') set org_id = group_id where org_id is null");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.18.07', modified = now() where param_name = 'version_db' and param_value = '1.18.06'");
   }
 
   if ($_POST["cleanup"]) {
@@ -1006,7 +1013,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.00)</b>
+    <td width="80%"><b>Create database structure (v1.18.05)</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>
@@ -1051,8 +1058,8 @@ if ($_POST) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.00)</td>
-    <td><input type="submit" name="convert11797to11800" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.05)</td>
+    <td><input type="submit" name="convert11797to11805" value="Update"></td>
   </tr>
 </table>