Browse Source

repo: change action visibility when repository visibility changed (#4414)

pull/4584/head
Unknwon 8 years ago
parent
commit
a887e475e3
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
  1. 2
      gogs.go
  2. 4
      models/action.go
  3. 7
      models/repo.go
  4. 2
      templates/.VERSION

2
gogs.go

@ -16,7 +16,7 @@ import (
"github.com/gogits/gogs/pkg/setting" "github.com/gogits/gogs/pkg/setting"
) )
const APP_VER = "0.11.19.0611" const APP_VER = "0.11.20.0611"
func init() { func init() {
setting.AppVer = APP_VER setting.AppVer = APP_VER

4
models/action.go

@ -21,8 +21,8 @@ import (
api "github.com/gogits/go-gogs-client" api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models/errors" "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/pkg/tool"
"github.com/gogits/gogs/pkg/setting" "github.com/gogits/gogs/pkg/setting"
"github.com/gogits/gogs/pkg/tool"
) )
type ActionType int type ActionType int
@ -78,7 +78,7 @@ type Action struct {
ActUserID int64 // Action user id. ActUserID int64 // Action user id.
ActUserName string // Action user name. ActUserName string // Action user name.
ActAvatar string `xorm:"-"` ActAvatar string `xorm:"-"`
RepoID int64 RepoID int64 `xorm:"INDEX"`
RepoUserName string RepoUserName string
RepoName string RepoName string
RefName string RefName string

7
models/repo.go

@ -1369,6 +1369,11 @@ func updateRepository(e Engine, repo *Repository, visibilityChanged bool) (err e
return fmt.Errorf("updateRepository[%d]: %v", forkRepos[i].ID, err) return fmt.Errorf("updateRepository[%d]: %v", forkRepos[i].ID, err)
} }
} }
// Change visibility of generated actions
if _, err = e.Where("repo_id = ?", repo.ID).Cols("is_private").Update(&Action{IsPrivate: repo.IsPrivate}); err != nil {
return fmt.Errorf("change action visibility of repository [id: %d]: %v", repo.ID, err)
}
} }
return nil return nil
@ -1376,7 +1381,7 @@ func updateRepository(e Engine, repo *Repository, visibilityChanged bool) (err e
func UpdateRepository(repo *Repository, visibilityChanged bool) (err error) { func UpdateRepository(repo *Repository, visibilityChanged bool) (err error) {
sess := x.NewSession() sess := x.NewSession()
defer sessionRelease(sess) defer sess.Close()
if err = sess.Begin(); err != nil { if err = sess.Begin(); err != nil {
return err return err
} }

2
templates/.VERSION

@ -1 +1 @@
0.11.19.0611 0.11.20.0611
Loading…
Cancel
Save