summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsquare <msquare@notrademark.de>2017-12-29 17:30:54 +0100
committermsquare <msquare@notrademark.de>2017-12-29 17:30:54 +0100
commitbe3652b44aa279d7a8ae153d8038959e71eb7ecc (patch)
treec14b5aa69e26bfee9dac4068202e9b019732905d
parent86a38a3372557bd72db309e7b24b4a4a95544397 (diff)
fix work log logs
-rw-r--r--db/update.sql2
-rw-r--r--includes/model/UserWorkLog_model.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/db/update.sql b/db/update.sql
index 351cf8b4..f012e319 100644
--- a/db/update.sql
+++ b/db/update.sql
@@ -51,7 +51,7 @@ ALTER TABLE `AngelTypes` ADD `show_on_dashboard` BOOLEAN NOT NULL AFTER `contact
UPDATE `AngelTypes` SET `show_on_dashboard` = TRUE;
-- Work Log
-CREATE TABLE `engelsystem`.`UserWorkLog` ( `id` INT NOT NULL AUTO_INCREMENT , `user_id` INT NOT NULL , `work_hours` DECIMAL NOT NULL , `comment` VARCHAR(200) NOT NULL , `created_user_id` INT NOT NULL , `created_timestamp` INT NOT NULL , PRIMARY KEY (`id`), INDEX (`user_id`), INDEX (`created_user_id`)) ENGINE = InnoDB;
+CREATE TABLE `UserWorkLog` ( `id` INT NOT NULL AUTO_INCREMENT , `user_id` INT NOT NULL , `work_hours` DECIMAL NOT NULL , `comment` VARCHAR(200) NOT NULL , `created_user_id` INT NOT NULL , `created_timestamp` INT NOT NULL , PRIMARY KEY (`id`), INDEX (`user_id`), INDEX (`created_user_id`)) ENGINE = InnoDB;
ALTER TABLE `UserWorkLog` ADD FOREIGN KEY (`created_user_id`) REFERENCES `User`(`UID`) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE `UserWorkLog` ADD FOREIGN KEY (`user_id`) REFERENCES `User`(`UID`) ON DELETE CASCADE ON UPDATE CASCADE;
ALTER TABLE `UserWorkLog` ADD INDEX(`created_timestamp`);
INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (NULL, 'admin_user_worklog', 'Manage user work log entries.');
diff --git a/includes/model/UserWorkLog_model.php b/includes/model/UserWorkLog_model.php
index d9628e1d..55e135ca 100644
--- a/includes/model/UserWorkLog_model.php
+++ b/includes/model/UserWorkLog_model.php
@@ -23,7 +23,7 @@ function UserWorkLogsForUser($user) {
*/
function UserWorkLog_delete($userWorkLog)
{
- $user_source = $userWorkLog['user_id'];
+ $user_source = User($userWorkLog['user_id']);
$result = Db::delete("DELETE FROM `UserWorkLog` WHERE `id`=?", [
$userWorkLog['id']
]);
@@ -42,7 +42,7 @@ function UserWorkLog_delete($userWorkLog)
*/
function UserWorkLog_update($userWorkLog)
{
- $user_source = $userWorkLog['user_id'];
+ $user_source = User($userWorkLog['user_id']);
$result = Db::update("UPDATE `UserWorkLog` SET
`work_hours`=?,
@@ -69,7 +69,7 @@ function UserWorkLog_create($userWorkLog)
{
global $user;
- $user_source = $userWorkLog['user_id'];
+ $user_source = User($userWorkLog['user_id']);
$result = Db::insert("INSERT INTO `UserWorkLog` (
`user_id`,