X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=dbinstall.php;h=b498249872e14b982f568823cfd86ee6be628cfa;hb=6dbcf228dba9d1175ffd0c177f0739c58ce0f199;hp=d50594446ed7b9a6fd1b061f32b2ed93838f8310;hpb=83987222fbafb8d6dbbbd9578ed2f949f65004d3;p=timetracker.git

diff --git a/dbinstall.php b/dbinstall.php
index d5059444..b4982498 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -789,10 +789,10 @@ if ($_POST) {
       if (is_a($result, 'PEAR_Error')) die($result->getMessage());
       $row = $result->fetchRow();
       if ($row['count'] == 0)
-        ttRoleHelper::createPredefinedRoles($team_id, $lang);
+        ttRoleHelper::createPredefinedRoles_1_17_44($team_id, $lang);
 
       // Obtain new role id based on legacy role.
-      $role_id = ttRoleHelper::getRoleByRank($legacy_role, $team_id);
+      $role_id = ttRoleHelper::getRoleByRank_1_17_44($legacy_role, $team_id);
       if (!$role_id) continue; // Role not found, nothing to do.
 
       $sql = "update tt_users set role_id = $role_id where id = $user_id and team_id = $team_id";
@@ -805,7 +805,7 @@ if ($_POST) {
     print "Updated $users_updated users...<br>\n";
   }
 
-  if ($_POST["convert11744to11788"]) {
+  if ($_POST["convert11744to11792"]) {
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'");
     setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324");
@@ -899,18 +899,20 @@ if ($_POST) {
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.87', modified = now() where param_name = 'version_db' and param_value = '1.17.86'");
     setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.87') set rights = replace(rights, 'manage_subgroups', 'manage_subgroups,delete_group') where rank = 512");
     setChange("UPDATE `tt_site_config` SET param_value = '1.17.88', modified = now() where param_name = 'version_db' and param_value = '1.17.87'");
+    setChange("ALTER TABLE `tt_fav_reports` ADD `show_work_units` tinyint(4) NOT NULL DEFAULT '0' AFTER `show_custom_field_1`");
+    setChange("UPDATE `tt_site_config` SET param_value = '1.17.92', modified = now() where param_name = 'version_db' and param_value = '1.17.88'");
   }
 
   if ($_POST["cleanup"]) {
 
     $mdb2 = getConnection();
-    $inactive_teams = ttTeamHelper::getInactiveGroups();
+    $inactive_groups = ttTeamHelper::getInactiveGroups();
 
-    $count = count($inactive_teams);
-    print "$count inactive teams found...<br>\n";
+    $count = count($inactive_groups);
+    print "$count inactive groups found...<br>\n";
     for ($i = 0; $i < $count; $i++) {
-      print "  deleting team ".$inactive_teams[$i]."<br>\n";
-      $res = ttTeamHelper::delete($inactive_teams[$i]);
+      print "  deleting group ".$inactive_groups[$i]."<br>\n";
+      $res = ttTeamHelper::delete($inactive_groups[$i]);
     }
 
     setChange("OPTIMIZE TABLE tt_client_project_binds");
@@ -944,7 +946,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.17.88)</b>
+    <td width="80%"><b>Create database structure (v1.17.92)</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>
@@ -984,8 +986,8 @@ if ($_POST) {
     <td><input type="submit" name="convert11400to11744" value="Update"><br><input type="submit" name="update_role_id" value="Update role_id"></td>
   </tr>
     <tr valign="top">
-    <td>Update database structure (v1.17.44 to v1.17.88)</td>
-    <td><input type="submit" name="convert11744to11788" value="Update"></td>
+    <td>Update database structure (v1.17.44 to v1.17.92)</td>
+    <td><input type="submit" name="convert11744to11792" value="Update"></td>
   </tr>
 </table>