From f33e6ae09ec27e898bb8f2cc44d587ea3b8e0dee Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Mon, 17 Jul 2017 05:04:43 +0300 Subject: Remove unit types commits and settings (#2161) * Remove unit types commits and settings * Can not limit units in administrator teams * Limit changing units only to teams with read and write access mode * Small code optimization --- modules/context/repo.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'modules/context') diff --git a/modules/context/repo.go b/modules/context/repo.go index d636496f50..3dface7da7 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -348,6 +348,9 @@ func RepoAssignment() macaron.Handler { ctx.Repo.PullRequest.HeadInfo = ctx.Repo.BranchName } } + + // Reset repo units as otherwise user specific units wont be loaded later + ctx.Repo.Repository.Units = nil } ctx.Data["PullRequestCtx"] = ctx.Repo.PullRequest @@ -549,10 +552,8 @@ func UnitTypes() macaron.Handler { ctx.Data["UnitTypeCode"] = models.UnitTypeCode ctx.Data["UnitTypeIssues"] = models.UnitTypeIssues ctx.Data["UnitTypePullRequests"] = models.UnitTypePullRequests - ctx.Data["UnitTypeCommits"] = models.UnitTypeCommits ctx.Data["UnitTypeReleases"] = models.UnitTypeReleases ctx.Data["UnitTypeWiki"] = models.UnitTypeWiki - ctx.Data["UnitTypeSettings"] = models.UnitTypeSettings ctx.Data["UnitTypeExternalWiki"] = models.UnitTypeExternalWiki ctx.Data["UnitTypeExternalTracker"] = models.UnitTypeExternalTracker } -- cgit v1.2.3