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/auth/org.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'modules/auth') diff --git a/modules/auth/org.go b/modules/auth/org.go index 367468e587..2abffdf74e 100644 --- a/modules/auth/org.go +++ b/modules/auth/org.go @@ -33,13 +33,14 @@ func (f *CreateOrgForm) Validate(ctx *macaron.Context, errs binding.Errors) bind // UpdateOrgSettingForm form for updating organization settings type UpdateOrgSettingForm struct { - Name string `binding:"Required;AlphaDashDot;MaxSize(40)" locale:"org.org_name_holder"` - FullName string `binding:"MaxSize(100)"` - Description string `binding:"MaxSize(255)"` - Website string `binding:"ValidUrl;MaxSize(255)"` - Location string `binding:"MaxSize(50)"` - Visibility structs.VisibleType - MaxRepoCreation int + Name string `binding:"Required;AlphaDashDot;MaxSize(40)" locale:"org.org_name_holder"` + FullName string `binding:"MaxSize(100)"` + Description string `binding:"MaxSize(255)"` + Website string `binding:"ValidUrl;MaxSize(255)"` + Location string `binding:"MaxSize(50)"` + Visibility structs.VisibleType + MaxRepoCreation int + RepoAdminChangeTeamAccess bool } // Validate validates the fields -- cgit v1.2.3