Skip to content

The Unified and Autonomous Development Platform

Fix issue #418 - Unable to rename/delete user or project

Robin Shen2bdaacaa7b92
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index ad2b72f271..0a6c0455c9 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -1122,7 +1122,7 @@ public class Project extends AbstractEntity {
this.codeComments = codeComments;
}
- @Editable(order=200, name="Code Management", description="Whether or not to enable code management for the project")
+ @Editable(order=250, name="Code Management", description="Whether or not to enable code management for the project")
public boolean isCodeManagementEnabled() {
return codeManagementEnabled;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
index 4d77bc0e27..0d5fad3c89 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
@@ -9,6 +9,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import javax.annotation.Nullable;
+
import org.hibernate.validator.constraints.NotEmpty;
import com.google.common.base.Splitter;
@@ -63,6 +65,7 @@ public abstract class JobExecutor implements Serializable {
@Editable(order=10000, name="Job Requirement", description="Optionally specify job requirement of this executor. "
+ "Only satisfied jobs can use this executor")
@JobRequirement
+ @Nullable
@NameOfEmptyValue("Can be used by any jobs")
public String getJobRequirement() {
return jobRequirement;
@@ -88,8 +91,10 @@ public abstract class JobExecutor implements Serializable {
public Usage onDeleteProject(String projectPath) {
Usage usage = new Usage();
- if (io.onedev.server.job.requirement.JobRequirement.parse(jobRequirement).isUsingProject(projectPath))
- usage.add("job match" );
+ if (jobRequirement != null
+ && io.onedev.server.job.requirement.JobRequirement.parse(jobRequirement).isUsingProject(projectPath)) {
+ usage.add("job requirement" );
+ }
return usage;
}
@@ -104,16 +109,20 @@ public abstract class JobExecutor implements Serializable {
public Usage onDeleteUser(String userName) {
Usage usage = new Usage();
- if (io.onedev.server.job.requirement.JobRequirement.parse(jobRequirement).isUsingUser(userName))
+ if (jobRequirement != null
+ && io.onedev.server.job.requirement.JobRequirement.parse(jobRequirement).isUsingUser(userName)) {
usage.add("job requirement" );
+ }
return usage;
}
public void onRenameUser(String oldName, String newName) {
- io.onedev.server.job.requirement.JobRequirement parsedJobRequirement =
- io.onedev.server.job.requirement.JobRequirement.parse(this.jobRequirement);
- parsedJobRequirement.onRenameUser(oldName, newName);
- jobRequirement = parsedJobRequirement.toString();
+ if (jobRequirement != null) {
+ io.onedev.server.job.requirement.JobRequirement parsedJobRequirement =
+ io.onedev.server.job.requirement.JobRequirement.parse(jobRequirement);
+ parsedJobRequirement.onRenameUser(oldName, newName);
+ jobRequirement = parsedJobRequirement.toString();
+ }
}
protected List<String> getTrustCertContent() {