Minor fixes

models/unit.go

@@ -162,22 +162,6 @@ func (u *UnitType) CanBeDefault() bool {
  return true
 }
 
-// GetContradictingUnits return units that can't be active at same time as this unit
-func (u *UnitType) GetContradictingUnits() []UnitType {
- switch *u {
- case UnitTypeIssues:
- return []UnitType{UnitTypeExternalTracker}
- case UnitTypeExternalTracker:
- return []UnitType{UnitTypeIssues}
- case UnitTypeWiki:
- return []UnitType{UnitTypeExternalWiki}
- case UnitTypeExternalWiki:
- return []UnitType{UnitTypeWiki}
- default:
- return nil
- }
-}
-
 // Unit is a section of one repository
 type Unit struct {
  Type UnitType

models/user.go

@@ -621,6 +621,7 @@ func (u *User) GetRepositories(page, pageSize int) (err error) {
 }
 
 // GetRepositoryIDs returns repositories IDs where user owned and has unittypes
+// Caller shall check that units is not globally disabled
 func (u *User) GetRepositoryIDs(units ...UnitType) ([]int64, error) {
  var ids []int64
 
@@ -635,6 +636,7 @@ func (u *User) GetRepositoryIDs(units ...UnitType) ([]int64, error) {
 }
 
 // GetOrgRepositoryIDs returns repositories IDs where user's team owned and has unittypes
+// Caller shall check that units is not globally disabled
 func (u *User) GetOrgRepositoryIDs(units ...UnitType) ([]int64, error) {
  var ids []int64
 
@@ -654,6 +656,7 @@ func (u *User) GetOrgRepositoryIDs(units ...UnitType) ([]int64, error) {
 }
 
 // GetAccessRepoIDs returns all repositories IDs where user's or user is a team member organizations
+// Caller shall check that units is not globally disabled
 func (u *User) GetAccessRepoIDs(units ...UnitType) ([]int64, error) {
  ids, err := u.GetRepositoryIDs(units...)
  if err != nil {

routers/user/home.go

@@ -157,6 +157,12 @@ func Dashboard(ctx *context.Context) {
 
 // Milestones render the user milestones page
 func Milestones(ctx *context.Context) {
+ if models.UnitTypeIssues.UnitGlobalDisabled() && models.UnitTypePullRequests.UnitGlobalDisabled() {
+ log.Debug("Milestones overview page not available as both issues and pull requests are globally disabled")
+ ctx.Status(404)
+ return
+ }
+
  ctx.Data["Title"] = ctx.Tr("milestones")
  ctx.Data["PageIsMilestonesDashboard"] = true
 
@@ -347,7 +353,7 @@ func Issues(ctx *context.Context) {
  isPullList := ctx.Params(":type") == "pulls"
  if isPullList {
  if models.UnitTypePullRequests.UnitGlobalDisabled() {
- log.Debug("Pull request overview page not available due to unit global disabled.")
+ log.Debug("Pull request overview page not available as it is globally disabled.")
  ctx.Status(404)
  return
  }
@@ -356,7 +362,7 @@ func Issues(ctx *context.Context) {
  ctx.Data["PageIsPulls"] = true
  } else {
  if models.UnitTypeIssues.UnitGlobalDisabled() {
- log.Debug("Issues overview page not available due go unit global disabled.")
+ log.Debug("Issues overview page not available as it is globally disabled.")
  ctx.Status(404)
  return
  }

templates/base/head_navbar.tmpl

@@ -16,7 +16,7 @@
  {{if not .UnitPullsGlobalDisabled}}
  <a class="item {{if .PageIsPulls}}active{{end}}" href="{{AppSubUrl}}/pulls">{{.i18n.Tr "pull_requests"}}</a>
  {{end}}
- {{if not .UnitIssuesGlobalDisabled}}
+ {{if not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled)}}
  {{if .ShowMilestonesDashboardPage}}<a class="item {{if .PageIsMilestonesDashboard}}active{{end}}" href="{{AppSubUrl}}/milestones">{{.i18n.Tr "milestones"}}</a>{{end}}
  {{end}}
  <a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "explore"}}</a>