From bf2e76fc7ef187ce3b3e1ed9172cedf55d8fd5cb Mon Sep 17 00:00:00 2001
From: FuXiaoHei <fuxiaohei@hexiaz.com>
Date: Sat, 29 Mar 2014 18:45:22 +0800
Subject: [PATCH 1/2] change issue reopen and close btn
---
templates/issue/view.tmpl | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/templates/issue/view.tmpl b/templates/issue/view.tmpl
index 6f0a384800..516206da96 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>
From beb1761d7c9c2bd85a9f67895836c77ec4bbb6bc Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sat, 29 Mar 2014 06:55:51 -0400
Subject: [PATCH 2/2] Mirror fix
---
gogs.go | 2 +-
routers/repo/issue.go | 1 +
templates/user/dashboard.tmpl | 2 +-
templates/user/profile.tmpl | 3 +--
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gogs.go b/gogs.go
index f4b7c72feb..f1372f0cfc 100644
--- a/gogs.go
+++ b/gogs.go
@@ -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 6ac8a53579..14876e1863 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/user/dashboard.tmpl b/templates/user/dashboard.tmpl
index bc0853fb0d..6064095b11 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 3733736dde..5ac8121f8b 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}}