aboutsummaryrefslogtreecommitdiffstats
path: root/routers
diff options
context:
space:
mode:
authorFuXiaoHei <fuxiaohei@hexiaz.com>2014-05-21 20:49:47 +0800
committerFuXiaoHei <fuxiaohei@hexiaz.com>2014-05-21 20:49:47 +0800
commit1331134316e1165d68d2cb6473e16929ed794dea (patch)
tree2673a86ff25e80a3c0267fc2800dffbafe7c72bc /routers
parent4e8a1bf9c927c6619926f09883dbb98af58587f8 (diff)
downloadgitea-1331134316e1165d68d2cb6473e16929ed794dea.tar.gz
gitea-1331134316e1165d68d2cb6473e16929ed794dea.zip
finish issue edit content preview
Diffstat (limited to 'routers')
-rw-r--r--routers/repo/issue.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 6ff72c19fc..8852dd08f9 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -390,6 +390,10 @@ func UpdateIssue(ctx *middleware.Context, params martini.Params, form auth.Creat
issue.AssigneeId = form.AssigneeId
issue.Labels = form.Labels
issue.Content = form.Content
+ // try get content from text, ignore conflict with preview ajax
+ if form.Content == "" {
+ issue.Content = ctx.Query("text")
+ }
if err = models.UpdateIssue(issue); err != nil {
ctx.Handle(500, "issue.UpdateIssue(UpdateIssue)", err)
return