From 752406c40cc7f1fa1c08832c744e7bbebf51609f Mon Sep 17 00:00:00 2001
From: Konrad Langenberg <konrad@kola-entertainments.de>
Date: Wed, 4 Oct 2017 23:37:39 +0200
Subject: [PATCH] Reimplemented usage of Comment Depenendent Issue (in struct)
 in comments

Signed-off-by: Konrad <konrad@kola-entertainments.de>
---
 models/issue_comment.go                       | 54 ++++++++++++-------
 routers/repo/issue.go                         |  6 +++
 .../repo/issue/view_content/comments.tmpl     |  6 +--
 3 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/models/issue_comment.go b/models/issue_comment.go
index 4af9ca9f4..6b476e08e 100644
--- a/models/issue_comment.go
+++ b/models/issue_comment.go
@@ -97,6 +97,7 @@ type Comment struct {
 	OldTitle         string
 	NewTitle         string
 	DependentIssueID int64
+	DependentIssue   *Issue `xorm:"-"`
 
 	CommitID        int64
 	Line            int64
@@ -117,25 +118,30 @@ type Comment struct {
 	ShowTag CommentTag `xorm:"-"`
 }
 
-// AfterLoad is invoked from XORM after setting the values of all fields of this object.
-func (c *Comment) AfterLoad(session *xorm.Session) {
-	c.Created = time.Unix(c.CreatedUnix, 0).Local()
-	c.Updated = time.Unix(c.UpdatedUnix, 0).Local()
-
+// AfterSet is invoked from XORM after setting the value of a field of this object.
+func (c *Comment) AfterSet(colName string, _ xorm.Cell) {
 	var err error
-	c.Attachments, err = getAttachmentsByCommentID(session, c.ID)
-	if err != nil {
-		log.Error(3, "getAttachmentsByCommentID[%d]: %v", c.ID, err)
-	}
-
-	c.Poster, err = getUserByID(session, c.PosterID)
-	if err != nil {
-		if IsErrUserNotExist(err) {
-			c.PosterID = -1
-			c.Poster = NewGhostUser()
-		} else {
-			log.Error(3, "getUserByID[%d]: %v", c.ID, err)
+	switch colName {
+	case "id":
+		c.Attachments, err = GetAttachmentsByCommentID(c.ID)
+		if err != nil {
+			log.Error(3, "GetAttachmentsByCommentID[%d]: %v", c.ID, err)
 		}
+
+	case "poster_id":
+		c.Poster, err = GetUserByID(c.PosterID)
+		if err != nil {
+			if IsErrUserNotExist(err) {
+				c.PosterID = -1
+				c.Poster = NewGhostUser()
+			} else {
+				log.Error(3, "GetUserByID[%d]: %v", c.ID, err)
+			}
+		}
+	case "created_unix":
+		c.Created = time.Unix(c.CreatedUnix, 0).Local()
+	case "updated_unix":
+		c.Updated = time.Unix(c.UpdatedUnix, 0).Local()
 	}
 }
 
@@ -269,6 +275,18 @@ func (c *Comment) LoadAssignees() error {
 	return nil
 }
 
+// LoadDepIssueDetails loads Dependent Issue Details
+func (c *Comment) LoadDepIssueDetails() error {
+	var err error
+	if c.DependentIssueID > 0 {
+		c.DependentIssue, err = getIssueByID(x, c.DependentIssueID)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // MailParticipants sends new comment emails to repository watchers
 // and mentioned people.
 func (c *Comment) MailParticipants(e Engine, opType ActionType, issue *Issue) (err error) {
@@ -319,6 +337,7 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err
 		Content:          opts.Content,
 		OldTitle:         opts.OldTitle,
 		NewTitle:         opts.NewTitle,
+		DependentIssue:   opts.DependentIssue,
 		DependentIssueID: depID,
 	}
 
@@ -508,7 +527,6 @@ func createIssueDependencyComment(e *xorm.Session, doer *User, issue *Issue, dep
 		Repo:           issue.Repo,
 		Issue:          issue,
 		DependentIssue: dependentIssue,
-		Content:        dependentIssue.Title,
 	})
 }
 
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 7aa83eca6..a81483f0e 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -28,6 +28,7 @@ import (
 	"code.gitea.io/gitea/modules/notification"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/util"
+	"net/http"
 )
 
 const (
@@ -683,6 +684,11 @@ func ViewIssue(ctx *context.Context) {
 				ctx.Handle(500, "LoadAssignees", err)
 				return
 			}
+		} else if comment.Type == models.CommentTypeRemoveDependency || comment.Type == models.CommentTypeAddDependency {
+			if err = comment.LoadDepIssueDetails(); err != nil {
+				ctx.Handle(http.StatusInternalServerError, "LoadDepIssueDetails", err)
+				return
+			}
 		}
 	}
 
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index da6eabc53..c9617daf1 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -192,8 +192,8 @@
 	     </span>
 	     <div class="detail">
 		     <span class="octicon octicon-plus"></span>
-		     <span class="text grey">{{.Content}}</span>
-	     </div>
+			 <span class="text grey"><a href="{{$.RepoLink}}/issues/{{.DependentIssue.Index}}">#{{.DependentIssue.Index}} {{.DependentIssue.Title}}</a></span>
+		 </div>
      </div>
      {{else if eq .Type 17}}
      <div class="event">
@@ -206,7 +206,7 @@
 	     </span>
 	     <div class="detail">
 		     <span class="text grey octicon octicon-trashcan"></span>
-		     <span class="text grey">{{.Content}}&nbsp;</span>
+			 <span class="text grey"><a href="{{$.RepoLink}}/issues/{{.DependentIssue.Index}}">#{{.DependentIssue.Index}} {{.DependentIssue.Title}}</a></span>
 	     </div>
      </div>
      {{end}}