The Unified and Autonomous Development Platform
Fix issue #325 - Make public role of GitHub import page optional
Robin Shen0d293672654e
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubImportOption.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubImportOption.javaindex 7c8d4743e7..b8965d9441 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubImportOption.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubImportOption.java@@ -5,6 +5,7 @@ import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;+import javax.annotation.Nullable;import javax.validation.ConstraintValidatorContext;import javax.validation.constraints.Size;@@ -50,9 +51,10 @@ public class GitHubImportOption implements Serializable, Validatable {this.imports = imports;}- @Editable(order=200, name="Public Role", description="Specify default role for public repositories")+ @Editable(order=200, name="Public Role", description="If specified, all public repositories imported from GitHub "+ + "will use this as default role. Private repositories are not affected")@RoleChoice- @NotEmpty+ @Nullablepublic String getPublicRoleName() {return publicRoleName;}@@ -61,8 +63,12 @@ public class GitHubImportOption implements Serializable, Validatable {this.publicRoleName = publicRoleName;}+ @Nullablepublic Role getPublicRole() {- return OneDev.getInstance(RoleManager.class).find(publicRoleName);+ if (publicRoleName != null)+ return OneDev.getInstance(RoleManager.class).find(publicRoleName);+ else+ return null;}@Editable(order=300, description="Specify which issue state to use for closed GitHub issues")diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubImporter.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubImporter.javaindex fd024c1835..e7d8f1a282 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubImporter.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubImporter.java@@ -118,7 +118,7 @@ public class GitHubImporter extends ProjectImporter<GitHubImportSource, GitHubImproject.setDescription(repoNode.get("description").asText(null));project.setIssueManagementEnabled(repoNode.get("has_issues").asBoolean());boolean isPrivate = repoNode.get("private").asBoolean();- if (!isPrivate)+ if (!isPrivate && importOption.getPublicRole() != null)project.setDefaultRole(importOption.getPublicRole());URIBuilder builder = new URIBuilder(repoNode.get("clone_url").asText());if (isPrivate)