Browse Source
fix: Add feed for organization (#3594)
* feat: Add feed for organization
* fix: testing
* fix: testing
* fix: testing
* fix: testing
aj-second-factor
Bo-Yi Wu
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
16 additions and
0 deletions
-
models/action_test.go
-
models/repo_watch.go
|
|
@ -339,6 +339,7 @@ func TestCommitRepoAction(t *testing.T) { |
|
|
|
|
|
|
|
s.action.ActUserID = user.ID |
|
|
|
s.action.RepoID = repo.ID |
|
|
|
s.action.Repo = repo |
|
|
|
s.action.IsPrivate = repo.IsPrivate |
|
|
|
|
|
|
|
testCorrectRepoAction(t, s.commitRepoActionOptions, &s.action) |
|
|
|
|
|
@ -87,6 +87,21 @@ func notifyWatchers(e Engine, act *Action) error { |
|
|
|
return fmt.Errorf("insert new actioner: %v", err) |
|
|
|
} |
|
|
|
|
|
|
|
act.loadRepo() |
|
|
|
// check repo owner exist.
|
|
|
|
if err := act.Repo.getOwner(e); err != nil { |
|
|
|
return fmt.Errorf("can't get repo owner: %v", err) |
|
|
|
} |
|
|
|
|
|
|
|
// Add feed for organization
|
|
|
|
if act.Repo.Owner.IsOrganization() && act.ActUserID != act.Repo.Owner.ID { |
|
|
|
act.ID = 0 |
|
|
|
act.UserID = act.Repo.Owner.ID |
|
|
|
if _, err = e.InsertOne(act); err != nil { |
|
|
|
return fmt.Errorf("insert new actioner: %v", err) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
for i := range watches { |
|
|
|
if act.ActUserID == watches[i].UserID { |
|
|
|
continue |
|
|
|