瀏覽代碼

Merge pull request #296 from nuss-justin/dev

Fix issue 280 & unwatch button in Firefox
tags/v0.9.99
无闻 10 年之前
父節點
當前提交
dc2e140360
共有 3 個檔案被更改,包括 17 行新增3 行删除
  1. 11
    1
      models/issue.go
  2. 4
    2
      public/js/app.js
  3. 2
    0
      templates/repo/nav.tmpl

+ 11
- 1
models/issue.go 查看文件

@@ -108,7 +108,17 @@ func NewIssue(issue *Issue) (err error) {
sess.Rollback()
return err
}
return sess.Commit()

if err = sess.Commit(); err != nil {
return err
}

if issue.MilestoneId > 0 {
// FIXES(280): Update milestone counter.
return ChangeMilestoneAssign(0, issue.MilestoneId, issue)
}

return
}

// GetIssueByIndex returns issue by given index in repository.

+ 4
- 2
public/js/app.js 查看文件

@@ -406,8 +406,10 @@ function initRepository() {
// watching script
(function () {
var $watch = $('#repo-watching'),
watchLink = $watch.data("watch"),
unwatchLink = $watch.data("unwatch");
watchLink = $watch.attr("data-watch"),
// Use $.attr() to work around jQuery not finding $.data("unwatch") in Firefox,
// which has a method "unwatch" on `Object` that gets returned instead.
unwatchLink = $watch.attr("data-unwatch");
$watch.on('click', '.to-watch', function () {
if ($watch.hasClass("watching")) {
return false;

+ 2
- 0
templates/repo/nav.tmpl 查看文件

@@ -31,6 +31,7 @@
</div>
</div>
</div>
{{if .IsSigned}}
<div class="btn-group {{if .IsRepositoryWatching}}watching{{else}}no-watching{{end}}" id="repo-watching" data-watch="/{{.Owner.Name}}/{{.Repository.Name}}/action/watch" data-unwatch="/{{.Owner.Name}}/{{.Repository.Name}}/action/unwatch">
{{if .IsRepositoryWatching}}
<button type="button" class="btn btn-default"><i class="fa fa-eye fa-lg fa-m"></i></button>
@@ -52,6 +53,7 @@
</div>
</div>
</div>
{{end}}
<!-- <div class="btn-group">
<button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Star"><i class="fa fa-star"></i>&nbsp;{{.Repository.NumStars}}</button>
</div> -->

Loading…
取消
儲存