fix comment

Author: wxiaoguang

models/organization/team.go

@@ -92,8 +92,6 @@ type Team struct {
 	// And the user will become the repo's admin (via collaborator) after the creation.
 	CanCreateOrgRepo bool `xorm:"NOT NULL DEFAULT false"`
 
-	// FIXME: ORG-REPO-ADMIN-DANGER-ZONE: it needs a new field to decide whether a repo admin can manage the repo's danger zone
-
 	Visibility structs.VisibleType `xorm:"NOT NULL DEFAULT 2"`
 }
 

models/perm/access/repo_permission.go

@@ -693,13 +693,17 @@ func CanDoerManageRepoDangerZone(perm *Permission) bool {
 	}
 
 	// FIXME: ORG-REPO-ADMIN-DANGER-ZONE: this is the legacy logic, "org repo admin" can delete a repo
-	// Ideally we need a new field in the Team like "CanAdminManageDangerZone" to control this permission, but for now we keep the legacy logic
+	// Ideally we need a new field in like "AdminManageDangerZone" to control this permission, but for now we keep the legacy logic
 	for _, team := range perm.orgRepoTeams {
 		if team.AccessMode >= perm_model.AccessModeAdmin {
 			return true
 		}
 	}
-	return false
+	// A special case: if the team allows to create repo, then the doer will be added as a collaborator with admin access.
+	// For this case, we also allow the doer to manage the danger zone as well, because the doer is effectively a repo admin.
+	// Since the admin permission from team is already allowed above (legacy logic), here nothing worse.
+	// Keep in mind: the newly created repo isn't in any org team, it only has the doer as a collaborator with admin access.
+	return perm.IsAdmin()
 }
 
 func CanDoerManageOrgRepoCollaboratorTeam(ctx context.Context, repo *repo_model.Repository, perm *Permission) bool {

models/user/user.go

@@ -150,9 +150,11 @@ type User struct {
 
 	// Introduced by "Add teams to repo on collaboration page. (#8045)"
 	// Whether a repo admin can add/remove a team to/from the repo on the collaboration page
-	// Although this should be a team setting .....
 	RepoAdminChangeTeamAccess bool `xorm:"NOT NULL DEFAULT false"`
 
+	// FIXME: ORG-REPO-ADMIN-DANGER-ZONE: it needs a new field to decide whether a repo admin can manage the repo's danger zone
+	// Team won't work for this case, because a newly create org repo isn't in any team (same as above)
+
 	// Preferences
 	DiffViewStyle       string `xorm:"NOT NULL DEFAULT ''"`
 	Theme               string `xorm:"NOT NULL DEFAULT ''"`