diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2014-03-29 19:30:11 +0800 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2014-03-29 19:30:11 +0800 |
| commit | 879ef8d81fa7dd194a7482c870cecab5a5ac964b (patch) | |
| tree | 37156046cee9abbf59781ceec641ff2cdaac987c | |
| parent | a726c125b572bc1ff0b445990821280e304db9ff (diff) | |
| parent | beb1761d7c9c2bd85a9f67895836c77ec4bbb6bc (diff) | |
Merge branch 'master' of github.com:gogits/gogs
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | routers/repo/issue.go | 1 | ||||
| -rw-r--r-- | templates/issue/view.tmpl | 6 | ||||
| -rw-r--r-- | templates/user/dashboard.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/profile.tmpl | 3 |
5 files changed, 6 insertions, 8 deletions
@@ -19,7 +19,7 @@ import ( // Test that go1.2 tag above is included in builds. main.go refers to this definition. const go12tag = true -const APP_VER = "0.1.9.0328 Alpha" +const APP_VER = "0.1.9.0329 Alpha" func init() { base.AppVer = APP_VER diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 6ac8a535..14876e18 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -221,6 +221,7 @@ func UpdateIssue(ctx *middleware.Context, params martini.Params, form auth.Creat } func Comment(ctx *middleware.Context, params martini.Params) { + fmt.Println(ctx.Query("change_status")) if !ctx.Repo.IsValid { ctx.Handle(404, "issue.Comment(invalid repo):", nil) } diff --git a/templates/issue/view.tmpl b/templates/issue/view.tmpl index 6f0a3848..516206da 100644 --- a/templates/issue/view.tmpl +++ b/templates/issue/view.tmpl @@ -87,10 +87,8 @@ <div class="text-right"> <div class="form-group"> {{if .Issue.IsClosed}} - <input type="hidden" value="reopen" name="change_status"/> - <button class="btn-default btn issue-open" id="issue-open-btn" data-origin="Re-Open" data-text="Re-Open & Comment">Reopen</button>{{else}} - <input type="hidden" value="close" name="change_status"/> - <button class="btn-default btn issue-close" id="issue-close-btn" data-origin="Close" data-text="Close & Comment">Close</button>{{end}} + <input type="submit" class="btn-default btn issue-open" id="issue-open-btn" data-origin="Re-Open" data-text="Re-Open & Comment" name="change_status" value="Reopen"/>{{else}} + <input type="submit" class="btn-default btn issue-close" id="issue-close-btn" data-origin="Close" data-text="Close & Comment" name="change_status" value="Close"/>{{end}} <button class="btn-success btn" id="issue-reply-btn">Comment</button> </div> </div> diff --git a/templates/user/dashboard.tmpl b/templates/user/dashboard.tmpl index bc0853fb..6064095b 100644 --- a/templates/user/dashboard.tmpl +++ b/templates/user/dashboard.tmpl @@ -18,7 +18,7 @@ {{range .Feeds}} <li> <i class="icon fa fa-{{ActionIcon .OpType}}"></i> - <div class="info"><span class="meta">{{TimeSince .Created}}</span><br>{{ActionDesc . | str2html}}</div> + <div class="info"><span class="meta">{{TimeSince .Created}}</span><br>{{ActionDesc . $.SignedUser.AvatarLink | str2html}}</div> <span class="clearfix"></span> </li> {{else}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 3733736d..5ac8121f 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -32,11 +32,10 @@ {{if eq .TabName "activity"}} <div class="tab-pane active"> <ul class="list-unstyled activity-list"> - {{$avatarLink := .Owner.AvatarLink}} {{range .Feeds}} <li> <i class="icon fa fa-{{ActionIcon .OpType}}"></i> - <div class="info"><span class="meta">{{TimeSince .Created}}</span><br>{{ActionDesc . $avatarLink | str2html}}</div> + <div class="info"><span class="meta">{{TimeSince .Created}}</span><br>{{ActionDesc . $.Owner.AvatarLink | str2html}}</div> <span class="clearfix"></span> </li> {{else}} |