From a0e88dfc2e5cc811facf8f96d0c6ca22dc49b9e1 Mon Sep 17 00:00:00 2001 From: David Svantesson Date: Mon, 23 Sep 2019 22:08:03 +0200 Subject: Add teams to repo on collaboration page. (#8045) * Add teams to repo on collaboration page. Signed-off-by: David Svantesson * Add option for repository admins to change teams access to repo. Signed-off-by: David Svantesson * Add comment for functions Signed-off-by: David Svantesson * Make RepoAdminChangeTeamAccess default false in xorm and make it default checked in template instead. Signed-off-by: David Svantesson * Make proper language strings and fix error redirection. * Add unit tests for adding and deleting team from repository. Signed-off-by: David Svantesson * Add database migration Signed-off-by: David Svantesson * Fix redirect Signed-off-by: David Svantesson * Fix locale string mismatch. Signed-off-by: David Svantesson * Move team access mode text logic to template. * Move collaborator access mode text logic to template. --- routers/api/v1/convert/convert.go | 17 +++++++++-------- routers/api/v1/org/org.go | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) (limited to 'routers/api') diff --git a/routers/api/v1/convert/convert.go b/routers/api/v1/convert/convert.go index 40e4ca7ae3..e0e7f609c7 100644 --- a/routers/api/v1/convert/convert.go +++ b/routers/api/v1/convert/convert.go @@ -206,14 +206,15 @@ func ToDeployKey(apiLink string, key *models.DeployKey) *api.DeployKey { // ToOrganization convert models.User to api.Organization func ToOrganization(org *models.User) *api.Organization { return &api.Organization{ - ID: org.ID, - AvatarURL: org.AvatarLink(), - UserName: org.Name, - FullName: org.FullName, - Description: org.Description, - Website: org.Website, - Location: org.Location, - Visibility: org.Visibility.String(), + ID: org.ID, + AvatarURL: org.AvatarLink(), + UserName: org.Name, + FullName: org.FullName, + Description: org.Description, + Website: org.Website, + Location: org.Location, + Visibility: org.Visibility.String(), + RepoAdminChangeTeamAccess: org.RepoAdminChangeTeamAccess, } } diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go index 3adc204d3b..8a1a478ba1 100644 --- a/routers/api/v1/org/org.go +++ b/routers/api/v1/org/org.go @@ -95,14 +95,15 @@ func Create(ctx *context.APIContext, form api.CreateOrgOption) { } org := &models.User{ - Name: form.UserName, - FullName: form.FullName, - Description: form.Description, - Website: form.Website, - Location: form.Location, - IsActive: true, - Type: models.UserTypeOrganization, - Visibility: visibility, + Name: form.UserName, + FullName: form.FullName, + Description: form.Description, + Website: form.Website, + Location: form.Location, + IsActive: true, + Type: models.UserTypeOrganization, + Visibility: visibility, + RepoAdminChangeTeamAccess: form.RepoAdminChangeTeamAccess, } if err := models.CreateOrganization(org, ctx.User); err != nil { if models.IsErrUserAlreadyExist(err) || -- cgit v1.2.3