diff options
author | slene <vslene@gmail.com> | 2014-03-28 00:51:49 +0800 |
---|---|---|
committer | slene <vslene@gmail.com> | 2014-03-28 00:51:49 +0800 |
commit | 06d3c87b23383899c476fd6e0330e4169b33a76d (patch) | |
tree | 48823fbc748b67beb779e0f5c4f5d4281688c810 /models/action.go | |
parent | 10b412d237e7594951ab3633dc8eebb965e25f68 (diff) | |
parent | 3144fac03cb468aa28c0ade7687b1d4df1de6abb (diff) |
Merge branch 'master' of github.com:gogits/gogs
Diffstat (limited to 'models/action.go')
-rw-r--r-- | models/action.go | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/models/action.go b/models/action.go index 46704eef..9d99df85 100644 --- a/models/action.go +++ b/models/action.go @@ -60,10 +60,10 @@ func (a Action) GetContent() string { // CommitRepoAction adds new action for committing repository. func CommitRepoAction(userId int64, userName string, - repoId int64, repoName string, refName string, commits *base.PushCommits) error { + repoId int64, repoName string, refName string, commit *base.PushCommits) error { log.Trace("action.CommitRepoAction(start): %d/%s", userId, repoName) - bs, err := json.Marshal(commits) + bs, err := json.Marshal(commit) if err != nil { log.Error("action.CommitRepoAction(json): %d/%s", userId, repoName) return err @@ -91,16 +91,13 @@ func CommitRepoAction(userId int64, userName string, return nil } -// NewRepoAction records action for create repository. -func NewRepoAction(user *User, repo *Repository) error { - _, err := orm.InsertOne(&Action{ - UserId: user.Id, - ActUserId: user.Id, - ActUserName: user.Name, - OpType: OP_CREATE_REPO, - RepoId: repo.Id, - RepoName: repo.Name, - }) +// NewRepoAction adds new action for creating repository. +func NewRepoAction(user *User, repo *Repository) (err error) { + if err = NotifyWatchers(&Action{ActUserId: user.Id, ActUserName: user.Name, OpType: OP_CREATE_REPO, + RepoId: repo.Id, RepoName: repo.Name}); err != nil { + log.Error("action.NewRepoAction(notify watchers): %d/%s", user.Id, repo.Name) + return err + } log.Trace("action.NewRepoAction: %s/%s", user.LowerName, repo.LowerName) return err |