From: Nik Okuntseff Date: Fri, 16 Mar 2018 21:26:54 +0000 (+0000) Subject: Added code to update legacy managers to top managers. X-Git-Tag: timetracker_1.19-1~1024 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=1e8bced6189bad0604be29c28bdabaf8c3e7442b;p=timetracker.git Added code to update legacy managers to top managers. --- diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php index 4e39628a..b30b9ccd 100644 --- a/WEB-INF/lib/ttTeamHelper.class.php +++ b/WEB-INF/lib/ttTeamHelper.class.php @@ -699,7 +699,6 @@ class ttTeamHelper { $result = array(); $mdb2 = getConnection(); - $role_manager = ROLE_MANAGER; $sql = "select t.name as team_name, u.id as manager_id, u.name as manager_name, u.login as manager_login, u.email as manager_email from tt_teams t inner join tt_users u on (u.team_id = t.id) diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index d5e05352..fd8324df 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- - - + +
 Anuko Time Tracker 1.17.48.4087 | Copyright © Anuko | +  Anuko Time Tracker 1.17.49.4088 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/dbinstall.php b/dbinstall.php index 5fec589e..bbe55d62 100644 --- a/dbinstall.php +++ b/dbinstall.php @@ -805,9 +805,11 @@ if ($_POST) { print "Updated $users_updated users...
\n"; } - if ($_POST["convert11744to11748"]) { + if ($_POST["convert11744to11749"]) { 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"); + setChange("UPDATE `tt_site_config` SET param_value = '1.17.49' where param_name = 'version_db' and param_value = '1.17.48'"); } if ($_POST["cleanup"]) { @@ -853,7 +855,7 @@ if ($_POST) {

DB Install

-
Create database structure (v1.17.48) + Create database structure (v1.17.49)
(applies only to new installations, do not execute when updating)
@@ -893,8 +895,8 @@ if ($_POST) {

Update database structure (v1.17.44 to v1.17.48)Update database structure (v1.17.44 to v1.17.49)