X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=dbinstall.php;h=653d13a1f5ced6e4ea665d670087a09e5ac91935;hb=1bebedf4f6025a06d5c738a82ef057d2d0200eac;hp=a6c499bd296285dd9e67b2e1362c64a19913bfc3;hpb=cd0fdd6bdf0879f047732df3d0092a291b35ff6c;p=timetracker.git
diff --git a/dbinstall.php b/dbinstall.php
index a6c499bd..653d13a1 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -957,7 +957,7 @@ if ($_POST) {
print "Updated $tt_expense_items_updated tt_expense_items records...
\n";
}
- if ($_POST["convert11797to11822"]) {
+ if ($_POST["convert11797to11826"]) {
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`");
@@ -1033,18 +1033,24 @@ if ($_POST) {
setChange("ALTER TABLE `tt_custom_field_log` ADD `org_id` int(11) default NULL AFTER `group_id`");
setChange("UPDATE `tt_site_config` SET param_value = '1.18.23', modified = now() where param_name = 'version_db' and param_value = '1.18.22'");
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`");
+ setChange("UPDATE `tt_site_config` SET param_value = '1.18.24', modified = now() where param_name = 'version_db' and param_value = '1.18.23'");
+ setChange("ALTER TABLE `tt_groups` ADD COLUMN `description` varchar(255) default NULL after `name`");
+ setChange("UPDATE `tt_site_config` SET param_value = '1.18.26', modified = now() where param_name = 'version_db' and param_value = '1.18.24'");
}
if ($_POST["cleanup"]) {
$mdb2 = getConnection();
- $inactive_groups = ttOrgHelper::getInactiveOrgs();
+ $inactive_orgs = ttOrgHelper::getInactiveOrgs();
- $count = count($inactive_groups);
- print "$count inactive groups found...
\n";
+ $count = count($inactive_orgs);
+ print "$count inactive organizations found...
\n";
for ($i = 0; $i < $count; $i++) {
- print " deleting group ".$inactive_groups[$i]."
\n";
- $res = ttTeamHelper::delete($inactive_groups[$i]); // TODO: rewrite this to delete subgroups, too.
+ print " deleting organization ".$inactive_orgs[$i]."
\n";
+ $res = ttOrgHelper::deleteOrg($inactive_orgs[$i]);
}
setChange("OPTIMIZE TABLE tt_client_project_binds");
@@ -1080,7 +1086,7 @@ if ($_POST) {
Create database structure (v1.18.22) + | Create database structure (v1.18.26)
(applies only to new installations, do not execute when updating) |