Merge pull request #296 from nuss-justin/dev

Fix issue 280 & unwatch button in Firefox
This commit is contained in:
无闻 2014-07-22 16:03:58 -04:00
commit dc2e140360
3 changed files with 17 additions and 3 deletions

View File

@ -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.

View File

@ -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;

View File

@ -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> -->