From 9100786beb0db4b3444d1be24e5a3bd680cdae1e Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Wed, 14 May 2014 08:51:04 -0400
Subject: Fix #185

---
 routers/repo/issue.go |  8 ++++----
 routers/user/home.go  | 16 ++++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'routers')

diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 8a894aa8c0..3e19724c38 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -337,18 +337,18 @@ func UpdateAssignee(ctx *middleware.Context) {
 		return
 	}
 
-	idx, err := base.StrTo(ctx.Query("issue")).Int64()
+	issueId, err := base.StrTo(ctx.Query("issue")).Int64()
 	if err != nil {
 		ctx.Error(404)
 		return
 	}
 
-	issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, idx)
+	issue, err := models.GetIssueById(issueId)
 	if err != nil {
 		if err == models.ErrIssueNotExist {
-			ctx.Handle(404, "issue.UpdateAssignee", err)
+			ctx.Handle(404, "issue.UpdateAssignee(GetIssueById)", err)
 		} else {
-			ctx.Handle(500, "issue.UpdateAssignee(GetIssueByIndex)", err)
+			ctx.Handle(500, "issue.UpdateAssignee(GetIssueById)", err)
 		}
 		return
 	}
diff --git a/routers/user/home.go b/routers/user/home.go
index a7a36b4bd7..2a2401c58f 100644
--- a/routers/user/home.go
+++ b/routers/user/home.go
@@ -221,18 +221,23 @@ func Issues(ctx *middleware.Context) {
 		issues[i], err = models.GetIssueById(ius[i].IssueId)
 		if err != nil {
 			if err == models.ErrIssueNotExist {
-				log.Error("user.Issues(#%d): issue not exist", ius[i].IssueId)
+				log.Warn("user.Issues(GetIssueById #%d): issue not exist", ius[i].IssueId)
 				continue
 			} else {
-				ctx.Handle(500, "user.Issues(GetIssue)", err)
+				ctx.Handle(500, fmt.Sprintf("user.Issues(GetIssueById #%d)", ius[i].IssueId), err)
 				return
 			}
 		}
 
 		issues[i].Repo, err = models.GetRepositoryById(issues[i].RepoId)
 		if err != nil {
-			ctx.Handle(500, "user.Issues(GetRepositoryById)", err)
-			return
+			if err == models.ErrRepoNotExist {
+				log.Warn("user.Issues(GetRepositoryById #%d): repository not exist", issues[i].RepoId)
+				continue
+			} else {
+				ctx.Handle(500, fmt.Sprintf("user.Issues(GetRepositoryById #%d)", issues[i].RepoId), err)
+				return
+			}
 		}
 
 		if err = issues[i].Repo.GetOwner(); err != nil {
@@ -240,8 +245,7 @@ func Issues(ctx *middleware.Context) {
 			return
 		}
 
-		issues[i].Poster, err = models.GetUserById(issues[i].PosterId)
-		if err != nil {
+		if err = issues[i].GetPoster(); err != nil {
 			ctx.Handle(500, "user.Issues(GetUserById)", err)
 			return
 		}
-- 
cgit v1.2.3