Browse Source

fix bug on issue view when not login (#1624)

* fix bug on issue view when not login

* hide issue watch when not login

* update the tests

* fix test on issue
for-closed-social
Lunny Xiao 7 years ago
committed by GitHub
parent
commit
e31c02d4bf
4 changed files with 52 additions and 10 deletions
  1. +21
    -0
      integrations/issue_test.go
  2. +15
    -0
      models/fixtures/repo_unit.yml
  3. +14
    -10
      routers/repo/issue.go
  4. +2
    -0
      templates/repo/issue/view_content/sidebar.tmpl

+ 21
- 0
integrations/issue_test.go View File

@ -0,0 +1,21 @@
// Copyright 2017 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package integrations
import (
"net/http"
"testing"
"github.com/stretchr/testify/assert"
)
func TestNoLoginViewIssue(t *testing.T) {
prepareTestEnv(t)
req, err := http.NewRequest("GET", "/user2/repo1/issues/1", nil)
assert.NoError(t, err)
resp := MakeRequest(req)
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
}

+ 15
- 0
models/fixtures/repo_unit.yml View File

@ -0,0 +1,15 @@
-
id: 1
repo_id: 1
type: 1
index: 0
config: "{}"
created_unix: 946684810
-
id: 2
repo_id: 1
type: 2
index: 0
config: "{}"
created_unix: 946684810

+ 14
- 10
routers/repo/issue.go View File

@ -465,16 +465,20 @@ func ViewIssue(ctx *context.Context) {
}
ctx.Data["Title"] = fmt.Sprintf("#%d - %s", issue.Index, issue.Title)
iw, exists, err := models.GetIssueWatch(ctx.User.ID, issue.ID)
if err != nil {
ctx.Handle(500, "GetIssueWatch", err)
return
}
if !exists {
iw = &models.IssueWatch{
UserID: ctx.User.ID,
IssueID: issue.ID,
IsWatching: models.IsWatching(ctx.User.ID, ctx.Repo.Repository.ID),
var iw *models.IssueWatch
var exists bool
if ctx.User != nil {
iw, exists, err = models.GetIssueWatch(ctx.User.ID, issue.ID)
if err != nil {
ctx.Handle(500, "GetIssueWatch", err)
return
}
if !exists {
iw = &models.IssueWatch{
UserID: ctx.User.ID,
IssueID: issue.ID,
IsWatching: models.IsWatching(ctx.User.ID, ctx.Repo.Repository.ID),
}
}
}
ctx.Data["IssueWatch"] = iw

+ 2
- 0
templates/repo/issue/view_content/sidebar.tmpl View File

@ -99,6 +99,7 @@
</div>
</div>
{{if $.IssueWatch}}
<div class="ui divider"></div>
<div class="ui watching">
@ -119,5 +120,6 @@
</form>
</div>
</div>
{{end}}
</div>
</div>

Loading…
Cancel
Save