finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

EnableUnit() -> UnitEnabled() (#2242)

Browse source
This commit is contained in:
Ethan Koenig 2017-08-02 01:46:54 -07:00 • committed by Lauris BH
parent 539d9f4c30
commit f29458bd3a
9 changed files with 29 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
models/org_team.go
View file

@ -192,8 +192,8 @@ func (t *Team) RemoveRepository(repoID int64) error {
return sess.Commit()
}
// EnableUnit returns if the team enables unit type t
func (t *Team) EnableUnit(tp UnitType) bool {
// UnitEnabled returns if the team has the given unit type enabled
func (t *Team) UnitEnabled(tp UnitType) bool {
if len(t.UnitTypes) == 0 {
return true
}

6
models/repo.go
View file

@ -398,8 +398,8 @@ func (repo *Repository) getUnitsByUserID(e Engine, userID int64, isAdmin bool) (
return nil
}
// EnableUnit if this repository enabled some unit
func (repo *Repository) EnableUnit(tp UnitType) bool {
// UnitEnabled if this repository has the given unit enabled
func (repo *Repository) UnitEnabled(tp UnitType) bool {
repo.getUnits(x)
for _, unit := range repo.Units {
if unit.Type == tp {
@ -658,7 +658,7 @@ func (repo *Repository) CanEnablePulls() bool {
// AllowsPulls returns true if repository meets the requirements of accepting pulls and has them enabled.
func (repo *Repository) AllowsPulls() bool {
return repo.CanEnablePulls() && repo.EnableUnit(UnitTypePullRequests)
return repo.CanEnablePulls() && repo.UnitEnabled(UnitTypePullRequests)
}
// CanEnableEditor returns true if repository meets the requirements of web editor.