diff options
| author | 无闻 <joe2010xtmf@163.com> | 2014-07-22 16:03:58 -0400 |
|---|---|---|
| committer | 无闻 <joe2010xtmf@163.com> | 2014-07-22 16:03:58 -0400 |
| commit | dc2e1403603789e438ced9ac7dceb736d70f426c (patch) | |
| tree | 9f27b9fb3907ef0bdb2f2c1a779776fcb37fd1cc | |
| parent | 5bbd5be0caf35f23de833f765e2eeb0e5772fbf3 (diff) | |
| parent | ec26b78d3cf1a72d0895ce37dc37b3f9cc3c11ea (diff) | |
Merge pull request #296 from nuss-justin/dev
Fix issue 280 & unwatch button in Firefox
| -rw-r--r-- | models/issue.go | 12 | ||||
| -rw-r--r-- | public/js/app.js | 6 | ||||
| -rw-r--r-- | templates/repo/nav.tmpl | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/models/issue.go b/models/issue.go index baf710a5..c370af36 100644 --- a/models/issue.go +++ b/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. diff --git a/public/js/app.js b/public/js/app.js index 4c376ea0..88ddd471 100644 --- a/public/js/app.js +++ b/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; diff --git a/templates/repo/nav.tmpl b/templates/repo/nav.tmpl index b689e442..69f60ba4 100644 --- a/templates/repo/nav.tmpl +++ b/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> {{.Repository.NumStars}}</button> </div> --> |