Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Admin teams should get all units regardless of form selection #4772

Closed
wants to merge 6 commits into from
Closed

Admin teams should get all units regardless of form selection #4772

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e314dd9
give admin team all available permissions
adelowo Aug 23, 2018
ae52679
Merge branch 'master' into admin_should_get_all_units
adelowo Aug 23, 2018
e299dee
Merge branch 'master' into admin_should_get_all_units
adelowo Aug 24, 2018
07e49dd
Merge branch 'master' into admin_should_get_all_units
adelowo Sep 4, 2018
b1bc88f
Merge branch 'master' into admin_should_get_all_units
adelowo Oct 26, 2018
11a8aba
Merge branch 'master' into admin_should_get_all_units
techknowlogick Nov 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 49 additions & 10 deletions routers/org/teams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,17 +187,37 @@ func NewTeamPost(ctx *context.Context, form auth.CreateTeamForm) {
Authorize: models.ParseAccessMode(form.Permission),
}

if t.Authorize < models.AccessModeOwner {
var units = make([]*models.TeamUnit, 0, len(form.Units))
var units []*models.TeamUnit

switch t.Authorize {

case models.AccessModeAdmin:
// If admin, just give all units regardless of the options
// coming in from the UI

units = make([]*models.TeamUnit, 0, len(models.Units))

for tp := range models.Units {
units = append(units, &models.TeamUnit{
OrgID: t.OrgID,
TeamID: t.ID,
Type: tp,
})
}

case models.AccessModeRead, models.AccessModeWrite:
units = make([]*models.TeamUnit, 0, len(form.Units))
for _, tp := range form.Units {
units = append(units, &models.TeamUnit{
OrgID: ctx.Org.Organization.ID,
Type: tp,
OrgID: t.OrgID,
TeamID: t.ID,
Type: tp,
})
}
t.Units = units
}

t.Units = units

ctx.Data["Team"] = t

if ctx.HasError() {
Expand Down Expand Up @@ -275,21 +295,40 @@ func EditTeamPost(ctx *context.Context, form auth.CreateTeamForm) {
t.Authorize = auth
}
}

t.Description = form.Description
if t.Authorize < models.AccessModeOwner {
var units = make([]models.TeamUnit, 0, len(form.Units))

var units []models.TeamUnit

switch t.Authorize {

case models.AccessModeAdmin:
// If admin, just give all units regardless of the options
// coming in from the UI

units = make([]models.TeamUnit, 0, len(models.Units))

for tp := range models.Units {
units = append(units, models.TeamUnit{
OrgID: t.OrgID,
TeamID: t.ID,
Type: tp,
})
}

case models.AccessModeRead, models.AccessModeWrite:
units = make([]models.TeamUnit, 0, len(form.Units))
for _, tp := range form.Units {
units = append(units, models.TeamUnit{
OrgID: t.OrgID,
TeamID: t.ID,
Type: tp,
})
}
models.UpdateTeamUnits(t, units)
} else {
models.UpdateTeamUnits(t, nil)
}

models.UpdateTeamUnits(t, units)

if ctx.HasError() {
ctx.HTML(200, tplTeamNew)
return
Expand Down