From a0e88dfc2e5cc811facf8f96d0c6ca22dc49b9e1 Mon Sep 17 00:00:00 2001
From: David Svantesson <davidsvantesson@gmail.com>
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 <davidsvantesson@gmail.com>

* Add option for repository admins to change teams access to repo.

Signed-off-by: David Svantesson <davidsvantesson@gmail.com>

* Add comment for functions

Signed-off-by: David Svantesson <davidsvantesson@gmail.com>

* Make RepoAdminChangeTeamAccess default false in xorm and make it default checked in template instead.

Signed-off-by: David Svantesson <davidsvantesson@gmail.com>

* Make proper language strings and fix error redirection.

* Add unit tests for adding and deleting team from repository.

Signed-off-by: David Svantesson <davidsvantesson@gmail.com>

* Add database migration

Signed-off-by: David Svantesson <davidsvantesson@gmail.com>

* Fix redirect

Signed-off-by: David Svantesson <davidsvantesson@gmail.com>

* Fix locale string mismatch.

Signed-off-by: David Svantesson <davidsvantesson@gmail.com>

* Move team access mode text logic to template.

* Move collaborator access mode text logic to template.
---
 templates/org/create.tmpl           | 11 +++++++++++
 templates/org/settings/options.tmpl | 10 ++++++++++
 2 files changed, 21 insertions(+)

(limited to 'templates/org')

diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl
index 5b6080c227..8ae0fc22af 100644
--- a/templates/org/create.tmpl
+++ b/templates/org/create.tmpl
@@ -32,6 +32,17 @@
 							</div>
 						</div>
 					</div>
+
+					<div class="field" id="permission_box">
+						<label>{{.i18n.Tr "org.settings.permission"}}</label>
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="hidden" type="checkbox" name="repo_admin_change_team_access" checked/>
+								<label>{{.i18n.Tr "org.settings.repoadminchangeteam"}}</label>
+							</div>
+						</div>
+					</div>
+
 					<div class="inline field">
 						<label></label>
 						<button class="ui green button">
diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl
index e8cfd97d4e..28660fe365 100644
--- a/templates/org/settings/options.tmpl
+++ b/templates/org/settings/options.tmpl
@@ -56,6 +56,16 @@
 							</div>
 						</div>
 
+						<div class="field" id="permission_box">
+							<label>{{.i18n.Tr "org.settings.permission"}}</label>
+							<div class="field">
+								<div class="ui checkbox">
+									<input class="hidden" type="checkbox" name="repo_admin_change_team_access" checked/>
+									<label>{{.i18n.Tr "org.settings.repoadminchangeteam"}}</label>
+								</div>
+							</div>
+						</div>
+
 						{{if .SignedUser.IsAdmin}}
 						<div class="ui divider"></div>
 
-- 
cgit v1.2.3