From 24364413261819a3a13dce97639fa6a3f670c4ca Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Fri, 16 Mar 2018 22:20:22 +0000 Subject: [PATCH] Dropped legacy role field. --- WEB-INF/lib/ttUser.class.php | 2 +- WEB-INF/templates/footer.tpl | 2 +- dbinstall.php | 10 ++++++---- mysql.sql | 7 +++---- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php index 621ab05f..420f1cac 100644 --- a/WEB-INF/lib/ttUser.class.php +++ b/WEB-INF/lib/ttUser.class.php @@ -71,7 +71,7 @@ class ttUser { $mdb2 = getConnection(); - $sql = "SELECT u.id, u.login, u.name, u.team_id, u.role, u.role_id, r.rank, r.rights, u.client_id, u.email, t.name as team_name, + $sql = "SELECT u.id, u.login, u.name, u.team_id, u.role_id, r.rank, r.rights, u.client_id, u.email, t.name as team_name, t.currency, t.lang, t.decimal_mark, t.date_format, t.time_format, t.week_start, t.tracking_mode, t.project_required, t.task_required, t.record_type, t.bcc_email, t.plugins, t.config, t.lock_spec, t.workday_minutes, t.custom_logo diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 4c2b3415..9a23ed46 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- - - + +
 Anuko Time Tracker 1.17.49.4089 | Copyright © Anuko | +  Anuko Time Tracker 1.17.50.4090 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/dbinstall.php b/dbinstall.php index bbe55d62..0d25d1b7 100644 --- a/dbinstall.php +++ b/dbinstall.php @@ -805,11 +805,13 @@ if ($_POST) { print "Updated $users_updated users...
\n"; } - if ($_POST["convert11744to11749"]) { + if ($_POST["convert11744to11750"]) { 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'"); + setChange("ALTER TABLE `tt_users` drop role"); + setChange("UPDATE `tt_site_config` SET param_value = '1.17.50' where param_name = 'version_db' and param_value = '1.17.49'"); } if ($_POST["cleanup"]) { @@ -855,7 +857,7 @@ if ($_POST) {

DB Install

-
Create database structure (v1.17.49) + Create database structure (v1.17.50)
(applies only to new installations, do not execute when updating)
@@ -895,8 +897,8 @@ if ($_POST) {
Update database structure (v1.17.44 to v1.17.49)Update database structure (v1.17.44 to v1.17.50)
diff --git a/mysql.sql b/mysql.sql index a4fa84c8..001e33f2 100644 --- a/mysql.sql +++ b/mysql.sql @@ -79,8 +79,7 @@ CREATE TABLE `tt_users` ( `password` varchar(50) default NULL, # password hash `name` varchar(100) default NULL, # user name `team_id` int(11) NOT NULL, # team id - `role` int(11) default 4, # user role ("manager", "co-manager", "client", or "user") - `role_id` int(11) default NULL, # future replacement of role + `role_id` int(11) default NULL, # role id `client_id` int(11) default NULL, # client id for "client" user role `rate` float(6,2) NOT NULL default '0.00', # default hourly rate `email` varchar(100) default NULL, # user email @@ -93,7 +92,7 @@ create unique index login_idx on tt_users(login, status); # Create admin account with password 'secret'. Admin is a superuser, who can create teams. DELETE from `tt_users` WHERE login = 'admin'; -INSERT INTO `tt_users` (`login`, `password`, `name`, `team_id`, `role`, `role_id`) VALUES ('admin', md5('secret'), 'Admin', '0', '1024', (select id from tt_roles where rank = 1024)); +INSERT INTO `tt_users` (`login`, `password`, `name`, `team_id`, `role_id`) VALUES ('admin', md5('secret'), 'Admin', '0', (select id from tt_roles where rank = 1024)); # @@ -427,4 +426,4 @@ CREATE TABLE `tt_site_config` ( PRIMARY KEY (`param_name`) ); -INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.48', now()); # TODO: change when structure changes. +INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.50', now()); # TODO: change when structure changes. -- 2.20.1