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. --- modules/structs/org.go | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'modules/structs') diff --git a/modules/structs/org.go b/modules/structs/org.go index 08ab139975..4b79a4e70a 100644 --- a/modules/structs/org.go +++ b/modules/structs/org.go @@ -6,14 +6,15 @@ package structs // Organization represents an organization type Organization struct { - ID int64 `json:"id"` - UserName string `json:"username"` - FullName string `json:"full_name"` - AvatarURL string `json:"avatar_url"` - Description string `json:"description"` - Website string `json:"website"` - Location string `json:"location"` - Visibility string `json:"visibility"` + ID int64 `json:"id"` + UserName string `json:"username"` + FullName string `json:"full_name"` + AvatarURL string `json:"avatar_url"` + Description string `json:"description"` + Website string `json:"website"` + Location string `json:"location"` + Visibility string `json:"visibility"` + RepoAdminChangeTeamAccess bool `json:"repo_admin_change_team_access"` } // CreateOrgOption options for creating an organization @@ -26,7 +27,8 @@ type CreateOrgOption struct { Location string `json:"location"` // possible values are `public` (default), `limited` or `private` // enum: public,limited,private - Visibility string `json:"visibility" binding:"In(,public,limited,private)"` + Visibility string `json:"visibility" binding:"In(,public,limited,private)"` + RepoAdminChangeTeamAccess bool `json:"repo_admin_change_team_access"` } // EditOrgOption options for editing an organization @@ -37,5 +39,6 @@ type EditOrgOption struct { Location string `json:"location"` // possible values are `public`, `limited` or `private` // enum: public,limited,private - Visibility string `json:"visibility" binding:"In(,public,limited,private)"` + Visibility string `json:"visibility" binding:"In(,public,limited,private)"` + RepoAdminChangeTeamAccess bool `json:"repo_admin_change_team_access"` } -- cgit v1.2.3