The Unified and Autonomous Development Platform
feat: Able to configure default root project under which to create forked projects (OD-2771)
Robin Shene673bc69cddc
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.javaindex 8fbac31032..bddc829e41 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java@@ -15,11 +15,13 @@ import org.apache.commons.lang3.StringUtils;import com.google.common.base.Preconditions;+import io.onedev.commons.utils.PathUtils;import io.onedev.server.OneDev;import io.onedev.server.ServerConfig;import io.onedev.server.annotation.ClassValidating;import io.onedev.server.annotation.DependsOn;import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.ProjectChoice;import io.onedev.server.annotation.ShowCondition;import io.onedev.server.git.location.CurlLocation;import io.onedev.server.git.location.GitLocation;@@ -65,6 +67,8 @@ public class SystemSetting implements Serializable, Validatable {private String avatarServiceUrl = "https://secure.gravatar.com/avatar/";+ private String defaultForkRoot = "forks";+@Editable(name="Server URL", order=90, description="Specify root URL to access this server")@NotEmptypublic String getServerUrl() {@@ -195,6 +199,32 @@ public class SystemSetting implements Serializable, Validatable {this.avatarServiceUrl = avatarServiceUrl;}+ @Editable(order=700, name="Default Fork Root", placeholder="No fork root", description="""+ When forking from the UI, the default target project will be created as+ <default fork root>/<account name>/<project name> if specified+ (users forking need permission to create child projects under the fork+ root), or <account name>/<project name> otherwise (need permission+ to create root projects)""")+ @ProjectChoice+ @Nullable+ public String getDefaultForkRoot() {+ return defaultForkRoot;+ }++ public void setDefaultForkRoot(String defaultForkRoot) {+ this.defaultForkRoot = defaultForkRoot;+ }++ public void onMoveProject(String oldPath, String newPath) {+ if (defaultForkRoot != null && PathUtils.isSelfOrAncestor(oldPath, defaultForkRoot))+ defaultForkRoot = PathUtils.substituteSelfOrAncestor(defaultForkRoot, oldPath, newPath);+ }++ public void onDeleteProject(String projectPath) {+ if (defaultForkRoot != null && PathUtils.isSelfOrAncestor(projectPath, defaultForkRoot))+ defaultForkRoot = null;+ }+public String getEffectiveSshRootUrl() {if (getSshRootUrl() != null)return getSshRootUrl();diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultSettingService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultSettingService.javaindex 623178f683..9503706a16 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultSettingService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultSettingService.java@@ -536,12 +536,14 @@ public class DefaultSettingService extends BaseEntityService<Setting> implementsif (getServiceDeskSetting() != null)getServiceDeskSetting().onMoveProject(oldPath, newPath);getIssueSetting().onMoveProject(oldPath, newPath);+ getSystemSetting().onMoveProject(oldPath, newPath);saveSetting(Key.JOB_EXECUTORS, (Serializable) getJobExecutors());saveSetting(Key.WORKSPACE_PROVISIONERS, (Serializable) getWorkspaceProvisioners());saveSetting(Key.GROOVY_SCRIPTS, (Serializable) getGroovyScripts());saveSetting(Key.SERVICE_DESK_SETTING, getServiceDeskSetting());saveSetting(Key.ISSUE, getIssueSetting());+ saveSetting(Key.SYSTEM, getSystemSetting());}@Override@@ -557,7 +559,10 @@ public class DefaultSettingService extends BaseEntityService<Setting> implementsif (getServiceDeskSetting() != null)usage.add(getServiceDeskSetting().onDeleteProject(projectPath));usage.add(getIssueSetting().onDeleteProject(projectPath));-++ getSystemSetting().onDeleteProject(projectPath);+ saveSetting(Key.SYSTEM, getSystemSetting());+return usage.prefix("administration");}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.javaindex 93acbab214..3a06554380 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java@@ -32,6 +32,7 @@ import io.onedev.server.service.AuditService;import io.onedev.server.service.BaseAuthorizationService;import io.onedev.server.service.ProjectLabelService;import io.onedev.server.service.ProjectService;+import io.onedev.server.service.SettingService;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;import io.onedev.server.web.editable.BeanContext;@@ -59,6 +60,9 @@ public abstract class ForkOptionPanel extends Panel {@Injectprivate ProjectLabelService projectLabelService;++ @Inject+ private SettingService settingService;public ForkOptionPanel(String id, IModel<Project> projectModel) {super(id);@@ -76,12 +80,26 @@ public abstract class ForkOptionPanel extends Panel {ParentBean parentBean = new ParentBean();String userName = SecurityUtils.getAuthUser().getName();- Project parent = projectService.findByPath(userName);- if (parent != null) {- if (SecurityUtils.canCreateChildren(parent))- parentBean.setParentPath(parent.getPath());- } else if (SecurityUtils.canCreateRootProjects()) {- parentBean.setParentPath(userName);+ String defaultForkRootPath = settingService.getSystemSetting().getDefaultForkRoot();+ String defaultParentPath;+ if (defaultForkRootPath != null)+ defaultParentPath = defaultForkRootPath + "/" + userName;+ else+ defaultParentPath = userName;++ Project defaultParent = projectService.findByPath(defaultParentPath);+ if (defaultParent != null) {+ if (SecurityUtils.canCreateChildren(defaultParent))+ parentBean.setParentPath(defaultParent.getPath());+ } else {+ Project defaultForkRoot = null;+ if (defaultForkRootPath != null)+ defaultForkRoot = projectService.findByPath(defaultForkRootPath);+ boolean canCreate = defaultForkRoot != null+ ? SecurityUtils.canCreateChildren(defaultForkRoot)+ : SecurityUtils.canCreateRootProjects();+ if (canCreate)+ parentBean.setParentPath(defaultParentPath);}DefaultRolesBean defaultRolesBean = new DefaultRolesBean();