summaryrefslogtreecommitdiffstats
path: root/models/issue.go
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2019-10-30 16:36:25 +0800
committerLauris BH <lauris@nix.lv>2019-10-30 10:36:25 +0200
commitf694bb45d79dcc093bc6332eabb3af063bc6b088 (patch)
tree8a9d2551d52a9a4ff13a087df30ed613d748d814 /models/issue.go
parent56ebc0c003349cea1c919c9dd408fc83ee79274e (diff)
downloadgitea-f694bb45d79dcc093bc6332eabb3af063bc6b088.tar.gz
gitea-f694bb45d79dcc093bc6332eabb3af063bc6b088.zip
Move issue change content from models to service (#8711)
* Move issue change content from models to service * fix lint
Diffstat (limited to 'models/issue.go')
-rw-r--r--models/issue.go43
1 files changed, 1 insertions, 42 deletions
diff --git a/models/issue.go b/models/issue.go
index b4bd190aa4..17205cc2fa 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -750,7 +750,6 @@ func (issue *Issue) UpdateAttachments(uuids []string) (err error) {
// ChangeContent changes issue content, as the given user.
func (issue *Issue) ChangeContent(doer *User, content string) (err error) {
- oldContent := issue.Content
issue.Content = content
sess := x.NewSession()
@@ -769,47 +768,7 @@ func (issue *Issue) ChangeContent(doer *User, content string) (err error) {
return err
}
- if err = sess.Commit(); err != nil {
- return err
- }
- sess.Close()
-
- mode, _ := AccessLevel(issue.Poster, issue.Repo)
- if issue.IsPull {
- issue.PullRequest.Issue = issue
- err = PrepareWebhooks(issue.Repo, HookEventPullRequest, &api.PullRequestPayload{
- Action: api.HookIssueEdited,
- Index: issue.Index,
- Changes: &api.ChangesPayload{
- Body: &api.ChangesFromPayload{
- From: oldContent,
- },
- },
- PullRequest: issue.PullRequest.APIFormat(),
- Repository: issue.Repo.APIFormat(mode),
- Sender: doer.APIFormat(),
- })
- } else {
- err = PrepareWebhooks(issue.Repo, HookEventIssues, &api.IssuePayload{
- Action: api.HookIssueEdited,
- Index: issue.Index,
- Changes: &api.ChangesPayload{
- Body: &api.ChangesFromPayload{
- From: oldContent,
- },
- },
- Issue: issue.APIFormat(),
- Repository: issue.Repo.APIFormat(mode),
- Sender: doer.APIFormat(),
- })
- }
- if err != nil {
- log.Error("PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
- } else {
- go HookQueue.Add(issue.RepoID)
- }
-
- return nil
+ return sess.Commit()
}
// GetTasks returns the amount of tasks in the issues content