From cd4f7ba5bf7191c2ca91438d8903ee9f28f406b9 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sat, 9 May 2020 16:18:44 +0200
Subject: Fix tracked time issues (#11349)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix nil exeption: #11313

* fix 500

* activate test 😆

* move logic
---
 models/issue_tracked_time.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'models')

diff --git a/models/issue_tracked_time.go b/models/issue_tracked_time.go
index 49fefd3279..195f3e7850 100644
--- a/models/issue_tracked_time.go
+++ b/models/issue_tracked_time.go
@@ -260,6 +260,10 @@ func DeleteTime(t *TrackedTime) error {
 		return err
 	}
 
+	if err := t.loadAttributes(sess); err != nil {
+		return err
+	}
+
 	if err := deleteTime(sess, t); err != nil {
 		return err
 	}
@@ -299,10 +303,8 @@ func deleteTime(e Engine, t *TrackedTime) error {
 
 // GetTrackedTimeByID returns raw TrackedTime without loading attributes by id
 func GetTrackedTimeByID(id int64) (*TrackedTime, error) {
-	time := &TrackedTime{
-		ID: id,
-	}
-	has, err := x.Get(time)
+	time := new(TrackedTime)
+	has, err := x.ID(id).Get(time)
 	if err != nil {
 		return nil, err
 	} else if !has {
-- 
cgit v1.2.3