Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-03 12:05:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #1463)Copy collaborators form source repository for private fork

Browse Source
This commit is contained in:
Naoki Takezoe
2017-02-26 15:07:19 +09:00
parent 16f0b68490
commit ae4da97ece
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/scala/gitbucket/core/controller/AccountController.scala
View File

@@ -2,7 +2,7 @@ package gitbucket.core.controller
import gitbucket.core.account.html import gitbucket.core.account.html
import gitbucket.core.helper import gitbucket.core.helper
import gitbucket.core.model.GroupMember import gitbucket.core.model.{GroupMember, Role}
import gitbucket.core.service._ import gitbucket.core.service._
import gitbucket.core.ssh.SshUtil import gitbucket.core.ssh.SshUtil
import gitbucket.core.util.ControlUtil._ import gitbucket.core.util.ControlUtil._
@@ -10,7 +10,6 @@ import gitbucket.core.util.Directory._
import gitbucket.core.util.Implicits._ import gitbucket.core.util.Implicits._
import gitbucket.core.util.StringUtil._ import gitbucket.core.util.StringUtil._
import gitbucket.core.util._ import gitbucket.core.util._
import io.github.gitbucket.scalatra.forms._ import io.github.gitbucket.scalatra.forms._
import org.apache.commons.io.FileUtils import org.apache.commons.io.FileUtils
import org.scalatra.i18n.Messages import org.scalatra.i18n.Messages
@@ -407,13 +406,15 @@ trait AccountControllerBase extends AccountManagementControllerBase {
parentUserName = Some(repository.owner) parentUserName = Some(repository.owner)
) )
// // Add collaborators for group repository // Set default collaborators for the private fork
// val ownerAccount = getAccountByUserName(accountName).get if(repository.repository.isPrivate){
// if(ownerAccount.isGroupAccount){ // Copy collaborators from the source repository
// getGroupMembers(accountName).foreach { member => getCollaborators(repository.owner, repository.name).foreach { case (collaborator, _) =>
// addCollaborator(accountName, repository.name, member.userName) addCollaborator(accountName, repository.name, collaborator.collaboratorName, collaborator.role)
// } }
// } // Register an owner of the source repository as a collaborator
addCollaborator(accountName, repository.name, repository.owner, Role.ADMIN.name)
}
// Insert default labels // Insert default labels
insertDefaultLabels(accountName, repository.name) insertDefaultLabels(accountName, repository.name)