fixed template issue, resolved conflicts

Signed-off-by: Konrad <konrad@kola-entertainments.de>

models/action.go

@@ -473,7 +473,7 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err
 			}
 
 			// Check for dependencies, if there aren't any, close it
-			canbeClosed := IssueNoDependenciesLeft(issue.ID)
+			canbeClosed := IssueNoDependenciesLeft(issue)
 
 			if canbeClosed {
 				if err = issue.ChangeStatus(doer, repo, true); err != nil {

routers/repo/issue.go

@@ -922,7 +922,7 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) {
 			// Check for open dependencies
 			if form.Status == "close" {
 
-				canbeClosed := models.IssueNoDependenciesLeft(issue.ID)
+				canbeClosed := models.IssueNoDependenciesLeft(issue)
 
 				if !canbeClosed {
 					if issue.IsPull {

routers/repo/issue_dependency_add.go

@@ -40,7 +40,9 @@ func AddDependency(c *context.Context) {
 	// Dependency
 	dep, err := models.GetIssueByID(depID)
 	if err != nil {
-		c.Handle(http.StatusInternalServerError, "GetIssueByID", err)
+		c.Flash.Error(c.Tr("add_error_dep_not_exist"))
+		url := fmt.Sprintf("%s/issues/%d", c.Repo.RepoLink, issueIndex)
+		c.Redirect(url, http.StatusSeeOther)
 		return
 	}
 
@@ -49,16 +51,12 @@ func AddDependency(c *context.Context) {
 		c.Flash.Error(c.Tr("issues.dependency.add_error_same_issue"))
 	} else {
 
-		exists, depExists, err := models.CreateIssueDependency(c.User, issue, dep)
+		err, exists := models.CreateIssueDependency(c.User, issue, dep)
 		if err != nil {
 			c.Handle(http.StatusInternalServerError, "CreateOrUpdateIssueDependency", err)
 			return
 		}
 
-		if !depExists {
-			c.Flash.Error(c.Tr("add_error_dep_not_exist"))
-		}
-
 		if exists {
 			c.Flash.Error(c.Tr("add_error_dep_exists"))
 		}

routers/repo/pull.go

@@ -428,7 +428,7 @@ func MergePullRequest(ctx *context.Context) {
 
 	pr.Issue = issue
 	pr.Issue.Repo = ctx.Repo.Repository
-	canbeClosed := models.IssueNoDependenciesLeft(issue.ID)
+	canbeClosed := models.IssueNoDependenciesLeft(issue)
 
 	if !canbeClosed {
 		ctx.Flash.Error("You need to close all issues blocking this pull request before you can merge it!")

templates/repo/issue/view_content/comments.tmpl

@@ -181,7 +181,6 @@
 			</a>
 			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.cancel_tracking_history"  $createdStr | Safe}}</span>
 		</div>
-	{{end}}
     {{else if eq .Type 16}}
         <div class="event">
         	<span class="octicon octicon-primitive-dot"></span>
@@ -192,7 +191,6 @@
         <span class="text grey">
 			{{$.i18n.Tr "repo.issues.dependency.added_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}}
 		</span>
-     {{end}}
      {{else if eq .Type 17}}
      <div class="event">
 	     <span class="octicon octicon-primitive-dot"></span>