summaryrefslogtreecommitdiffstats
path: root/routers
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2016-07-17 09:25:30 +0800
committerUnknwon <u@gogs.io>2016-07-17 09:25:30 +0800
commit5aa2bf86f4cb9b3c6c472a3f8f1db10331f27c65 (patch)
treea645f612482c700b5c6f045b6ce488123a542487 /routers
parentb0eb47cb1c6c1399b3fcd880b17c9d5e70af329e (diff)
downloadgitea-5aa2bf86f4cb9b3c6c472a3f8f1db10331f27c65.tar.gz
gitea-5aa2bf86f4cb9b3c6c472a3f8f1db10331f27c65.zip
Update locales and .gopmfile
Diffstat (limited to 'routers')
-rw-r--r--routers/api/v1/api.go2
-rw-r--r--routers/repo/issue.go4
2 files changed, 5 insertions, 1 deletions
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index f60bb58bd4..4fac550e82 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -224,7 +224,7 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Group("/hooks", func() {
m.Combo("").Get(repo.ListHooks).
Post(bind(api.CreateHookOption{}), repo.CreateHook)
- m.Combo("/:id:int").Patch(bind(api.EditHookOption{}), repo.EditHook).
+ m.Combo("/:id").Patch(bind(api.EditHookOption{}), repo.EditHook).
Delete(repo.DeleteHook)
})
m.Get("/raw/*", context.RepoRef(), repo.GetRawFile)
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index accf51d1ec..52524297da 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -223,6 +223,10 @@ func Issues(ctx *context.Context) {
return
}
+ if viewType == "assigned" {
+ assigneeID = 0 // Reset ID to prevent unexpected selection of assignee.
+ }
+
ctx.Data["IssueStats"] = issueStats
ctx.Data["SelectLabels"] = com.StrTo(selectLabels).MustInt64()
ctx.Data["ViewType"] = viewType