Skip to content

The Unified and Autonomous Development Platform

Multiple job executor support based on criterias

Robin Shenacaa146a0e49
diff --git a/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.java b/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.java
index 9dd1a2fe34..d0cd724014 100644
--- a/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.java
+++ b/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.java
@@ -72,16 +72,15 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
@Inject
public DefaultJobScheduler(ProjectManager projectManager, Build2Manager buildManager,
- UserManager userManager, ListenerRegistry listenerRegistry,
- TransactionManager transactionManager, ExecutorService executorService,
- SettingManager settingManager) {
+ UserManager userManager, ListenerRegistry listenerRegistry, SettingManager settingManager,
+ TransactionManager transactionManager, ExecutorService executorService) {
this.projectManager = projectManager;
+ this.settingManager = settingManager;
this.buildManager = buildManager;
this.userManager = userManager;
this.listenerRegistry = listenerRegistry;
this.transactionManager = transactionManager;
this.executorService = executorService;
- this.settingManager = settingManager;
}
@Sessional
@@ -161,9 +160,15 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
dependencyChain.add(jobName);
- CISpec ciSpec = project.getCISpec(ObjectId.fromString(commitHash));
- if (ciSpec == null) {
- markBuildError(build, "No CI spec");
+ CISpec ciSpec;
+ try {
+ ciSpec = project.getCISpec(ObjectId.fromString(commitHash));
+ if (ciSpec == null) {
+ markBuildError(build, "No CI spec");
+ return builds;
+ }
+ } catch (Exception e) {
+ markBuildError(build, "Invalid CI spec");
return builds;
}
@@ -198,18 +203,23 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
}
private void run(Build2 build) {
- JobExecutor jobExecutor = settingManager.getJobExecutor();
- if (jobExecutor != null) {
- CISpec ciSpec = build.getProject().getCISpec(ObjectId.fromString(build.getCommitHash()));
+ ObjectId commitId = ObjectId.fromString(build.getCommitHash());
+ try {
+ CISpec ciSpec = build.getProject().getCISpec(commitId);
if (ciSpec != null) {
Job job = ciSpec.getJobMap().get(build.getJobName());
if (job != null) {
- String runningInstance = jobExecutor.run(job.getImage(), job.getCommands());
- if (runningInstance != null) {
- build.setStatus(Build2.Status.RUNNING);
- build.setRunningDate(new Date());
- buildManager.save(build);
- listenerRegistry.post(new BuildRunning(build));
+ JobExecutor executor = settingManager.getJobExecutor(build.getProject(), commitId, job.getName(), job.getEnvironment());
+ if (executor != null) {
+ String runningInstance = executor.run(job.getEnvironment(), job.getCommands());
+ if (runningInstance != null) {
+ build.setStatus(Build2.Status.RUNNING);
+ build.setRunningDate(new Date());
+ buildManager.save(build);
+ listenerRegistry.post(new BuildRunning(build));
+ }
+ } else {
+ markBuildError(build, "No applicable job executor");
}
} else {
markBuildError(build, "Job not found");
@@ -217,8 +227,8 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
} else {
markBuildError(build, "No CI spec");
}
- } else {
- markBuildError(build, "No applicable job executor");
+ } catch (Exception e) {
+ markBuildError(build, "Invalid CI spec");
}
}
@@ -235,13 +245,19 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
public void on(ProjectEvent event) {
if (event instanceof CommitAware) {
ObjectId commitId = ((CommitAware) event).getCommitId();
- CISpec ciSpec = event.getProject().getCISpec(commitId);
- if (ciSpec != null) {
- for (Job job: ciSpec.getJobs()) {
- JobTrigger trigger = job.getMatchedTrigger(event);
- if (trigger != null)
- submit(event.getProject(), commitId.name(), job.getName(), getParamMatrix(trigger.getParams()));
+ try {
+ CISpec ciSpec = event.getProject().getCISpec(commitId);
+ if (ciSpec != null) {
+ for (Job job: ciSpec.getJobs()) {
+ JobTrigger trigger = job.getMatchedTrigger(event);
+ if (trigger != null)
+ submit(event.getProject(), commitId.name(), job.getName(), getParamMatrix(trigger.getParams()));
+ }
}
+ } catch (Exception e) {
+ String message = String.format("Error parsing CI spec (project: %s, commit: %s)",
+ event.getProject().getName(), commitId.name());
+ logger.error(message, e);
}
}
}
@@ -272,15 +288,11 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
@Override
public void cancel(Build2 build) {
if (build.getStatus() == Build2.Status.RUNNING) {
- JobExecutor jobExecutor = settingManager.getJobExecutor();
- if (jobExecutor != null) {
- if (jobExecutor.isRunning(build.getRunningInstance()))
- jobExecutor.stop(build.getRunningInstance());
- else
- markBuildError(build, "Aborted for unknown reason");
- } else {
- markBuildError(build, "No applicable job executor");
- }
+ JobExecutor executor = settingManager.getJobExecutor(build.getRunningInstance());
+ if (executor != null)
+ executor.stop(build.getRunningInstance());
+ else
+ markBuildError(build, "Aborted for unknown reason");
} else if (!build.isFinished()) {
build.setStatus(Build2.Status.CANCELLED);
build.setErrorMessage(null);
@@ -328,27 +340,28 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
if (build.getStatus() == Build2.Status.PENDING) {
DefaultJobScheduler.this.run(build);
} else if (build.getStatus() == Build2.Status.RUNNING) {
- CISpec ciSpec = build.getProject().getCISpec(ObjectId.fromString(build.getCommitHash()));
- if (ciSpec != null) {
- Job job = ciSpec.getJobMap().get(build.getJobName());
- if (job != null) {
- if (System.currentTimeMillis() - build.getRunningDate().getTime() > job.getTimeout() * 1000L) {
- JobExecutor jobExecutor = settingManager.getJobExecutor();
- if (jobExecutor != null) {
- if (jobExecutor.isRunning(build.getRunningInstance()))
- jobExecutor.stop(build.getRunningInstance());
+ ObjectId commitId = ObjectId.fromString(build.getCommitHash());
+ try {
+ CISpec ciSpec = build.getProject().getCISpec(commitId);
+ if (ciSpec != null) {
+ Job job = ciSpec.getJobMap().get(build.getJobName());
+ if (job != null) {
+ if (System.currentTimeMillis() - build.getRunningDate().getTime() > job.getTimeout() * 1000L) {
+ JobExecutor executor = settingManager.getJobExecutor(build.getRunningInstance());
+ if (executor != null)
+ executor.stop(build.getRunningInstance());
else
- markBuildError(build, "Aborted for unknown reason");
- } else {
- markBuildError(build, "No applicable job executor");
+ markBuildError(build, "Stopped for unknown reason");
}
+ } else {
+ markBuildError(build, "Job not found");
}
} else {
- markBuildError(build, "Job not found");
- }
- } else {
- markBuildError(build, "No CI spec");
- }
+ markBuildError(build, "No CI spec");
+ }
+ } catch (Exception e) {
+ markBuildError(build, "Invalid CI spec");
+ }
} else if (build.getStatus() == Build2.Status.WAITING) {
boolean hasUnsuccessful = false;
boolean hasUnfinished = false;
diff --git a/core/src/main/java/io/onedev/server/ci/Job.java b/core/src/main/java/io/onedev/server/ci/Job.java
index d2ef274e6f..b72f831505 100644
--- a/core/src/main/java/io/onedev/server/ci/Job.java
+++ b/core/src/main/java/io/onedev/server/ci/Job.java
@@ -13,7 +13,7 @@ import io.onedev.server.event.ProjectEvent;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Horizontal;
-import io.onedev.server.web.editable.annotation.PathPatterns;
+import io.onedev.server.web.editable.annotation.Patterns;
@Editable
@Horizontal
@@ -23,7 +23,7 @@ public class Job implements Serializable {
private String name;
- private String image;
+ private String environment;
private List<String> commands;
@@ -51,14 +51,16 @@ public class Job implements Serializable {
this.name = name;
}
- @Editable(order=110, name="Docker Image", description="Specify the docker image to run the command")
+ @Editable(order=110, description="Specify the environment to run the command. Environment will be interpretated "
+ + "by underlying job executor. For instance, a docker executor will treat it as a docker image, and an "
+ + "agent executor will treat it as labels to match agents")
@NotEmpty
- public String getImage() {
- return image;
+ public String getEnvironment() {
+ return environment;
}
- public void setImage(String image) {
- this.image = image;
+ public void setEnvironment(String environment) {
+ this.environment = environment;
}
@Editable(order=120, description="Specify commands to execute, with one command per line")
@@ -120,7 +122,7 @@ public class Job implements Serializable {
@Editable(order=600, description="Optionally specify space-separated workspace files to publish as artifacts. "
+ "Use * or ? for wildcard match")
- @PathPatterns
+ @Patterns
public String getPublishArtifacts() {
return publishArtifacts;
}
diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java
index 9b96b36b65..b6a882bf0e 100644
--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java
+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java
@@ -14,7 +14,7 @@ import io.onedev.server.git.GitUtils;
import io.onedev.server.util.OneContext;
import io.onedev.server.web.editable.annotation.BranchPatterns;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.PathPatterns;
+import io.onedev.server.web.editable.annotation.Patterns;
import io.onedev.server.web.util.SuggestionUtils;
@Editable(order=100, name="When pushes to branches")
@@ -27,7 +27,8 @@ public class BranchPushedTrigger extends JobTrigger {
private String paths;
@Editable(name="Pushed Branches", order=100,
- description="Optionally specify space-separated branches to check. Use * or ? for wildcard match")
+ description="Optionally specify space-separated branches to check. Use * or ? for wildcard match. "
+ + "Leave empty to match all branches")
@BranchPatterns
public String getBranches() {
return branches;
@@ -38,8 +39,9 @@ public class BranchPushedTrigger extends JobTrigger {
}
@Editable(name="Touched Files", order=200,
- description="Optionally specify space-separated files to check. Use * or ? for wildcard match")
- @PathPatterns("getPathSuggestions")
+ description="Optionally specify space-separated files to check. Use * or ? for wildcard match. "
+ + "Leave empty to match all files")
+ @Patterns("getPathSuggestions")
public String getPaths() {
return paths;
}
diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java
index 7fd39885cd..85c691b542 100644
--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java
+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java
@@ -15,7 +15,7 @@ public class PullRequestTrigger extends JobTrigger {
private String targetBranches;
@Editable(order=100, description="Optionally specify target branches of the pull request to check. "
- + "Use * or ? for wildcard match")
+ + "Use * or ? for wildcard match. Leave empty to match all pull requests")
@BranchPatterns
public String getTargetBranches() {
return targetBranches;
diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java
index cb144533aa..dc446424b9 100644
--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java
+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java
@@ -18,7 +18,8 @@ public class TagCreatedTrigger extends JobTrigger {
private String tags;
@Editable(name="Created Tags", order=100,
- description="Optionally specify tags to check. Use * or ? for wildcard match")
+ description="Optionally specify space-separated tags to check. Use * or ? for wildcard match. "
+ + "Leave empty to match all tags")
@TagPatterns
public String getTags() {
return tags;
diff --git a/core/src/main/java/io/onedev/server/data/DefaultDataManager.java b/core/src/main/java/io/onedev/server/data/DefaultDataManager.java
index 8e30c70833..11a2190ed2 100644
--- a/core/src/main/java/io/onedev/server/data/DefaultDataManager.java
+++ b/core/src/main/java/io/onedev/server/data/DefaultDataManager.java
@@ -153,9 +153,9 @@ public class DefaultDataManager implements DataManager, Serializable {
if (setting == null) {
settingManager.saveAuthenticator(null);
}
- setting = settingManager.getSetting(Key.JOB_EXECUTOR);
+ setting = settingManager.getSetting(Key.JOB_EXECUTORS);
if (setting == null) {
- settingManager.saveJobExecutor(null);
+ settingManager.saveJobExecutors(new ArrayList<>());
}
setting = settingManager.getSetting(Key.MAIL);
diff --git a/core/src/main/java/io/onedev/server/entitymanager/SettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
index a4b3c9a22b..e9600de10a 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
@@ -1,7 +1,12 @@
package io.onedev.server.entitymanager;
+import java.util.List;
+
import javax.annotation.Nullable;
+import org.eclipse.jgit.lib.ObjectId;
+
+import io.onedev.server.model.Project;
import io.onedev.server.model.Setting;
import io.onedev.server.model.support.authenticator.Authenticator;
import io.onedev.server.model.support.jobexecutor.JobExecutor;
@@ -99,9 +104,13 @@ public interface SettingManager extends EntityManager<Setting> {
void saveAuthenticator(@Nullable Authenticator authenticator);
- @Nullable
- JobExecutor getJobExecutor();
+ List<JobExecutor> getJobExecutors();
- void saveJobExecutor(JobExecutor jobExecutor);
+ void saveJobExecutors(List<JobExecutor> jobExecutors);
+
+ @Nullable
+ JobExecutor getJobExecutor(Project project, ObjectId commitId, String jobName, String image);
+ @Nullable
+ JobExecutor getJobExecutor(String runningInstance);
}
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
index 10e12857b3..8c01de7126 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
@@ -1,14 +1,28 @@
package io.onedev.server.entitymanager.impl;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+
+import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
+import org.eclipse.jgit.lib.ObjectId;
import org.hibernate.criterion.Restrictions;
import com.google.common.base.Preconditions;
+import com.google.common.collect.Sets;
+import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;
+import io.onedev.commons.utils.stringmatch.Matcher;
+import io.onedev.server.OneDev;
+import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.data.DataManager;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.git.RefInfo;
+import io.onedev.server.model.Project;
import io.onedev.server.model.Setting;
import io.onedev.server.model.Setting.Key;
import io.onedev.server.model.support.authenticator.Authenticator;
@@ -23,12 +37,15 @@ import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
+import io.onedev.server.util.patternset.PatternSet;
@Singleton
public class DefaultSettingManager extends AbstractEntityManager<Setting> implements SettingManager {
private final DataManager dataManager;
+ private final CommitInfoManager commitInfoManager;
+
private volatile Long systemSettingId;
private volatile Long mailSettingId;
@@ -44,9 +61,10 @@ public class DefaultSettingManager extends AbstractEntityManager<Setting> implem
private volatile Long jobExecutorId;
@Inject
- public DefaultSettingManager(Dao dao, DataManager dataManager) {
+ public DefaultSettingManager(Dao dao, DataManager dataManager, CommitInfoManager commitInfoManager) {
super(dao);
this.dataManager = dataManager;
+ this.commitInfoManager = commitInfoManager;
}
@Sessional
@@ -216,28 +234,61 @@ public class DefaultSettingManager extends AbstractEntityManager<Setting> implem
dao.persist(setting);
}
+ @SuppressWarnings("unchecked")
@Override
- public JobExecutor getJobExecutor() {
+ public List<JobExecutor> getJobExecutors() {
Setting setting;
if (jobExecutorId == null) {
- setting = getSetting(Key.JOB_EXECUTOR);
+ setting = getSetting(Key.JOB_EXECUTORS);
Preconditions.checkNotNull(setting);
jobExecutorId = setting.getId();
} else {
setting = load(jobExecutorId);
}
- return (JobExecutor) setting.getValue();
+ return (List<JobExecutor>) setting.getValue();
}
@Override
- public void saveJobExecutor(JobExecutor jobExecutor) {
- Setting setting = getSetting(Key.JOB_EXECUTOR);
+ public void saveJobExecutors(List<JobExecutor> jobExecutors) {
+ Setting setting = getSetting(Key.JOB_EXECUTORS);
if (setting == null) {
setting = new Setting();
- setting.setKey(Key.JOB_EXECUTOR);
+ setting.setKey(Key.JOB_EXECUTORS);
}
- setting.setValue(jobExecutor);
+ setting.setValue((Serializable) jobExecutors);
dao.persist(setting);
}
+ @Nullable
+ public JobExecutor getJobExecutor(Project project, ObjectId commitId, String jobName, String image) {
+ Matcher matcher = new ChildAwareMatcher();
+
+ for (JobExecutor executor: OneDev.getInstance(SettingManager.class).getJobExecutors()) {
+ if (executor.isEnabled()
+ && PatternSet.fromString(executor.getProjects()).matches(matcher, project.getName())
+ && PatternSet.fromString(executor.getJobs()).matches(matcher, jobName)
+ && PatternSet.fromString(executor.getEnvironments()).matches(matcher, image)) {
+ Collection<ObjectId> descendants = commitInfoManager.getDescendants(project, Sets.newHashSet(commitId));
+ descendants.add(commitId);
+
+ PatternSet branchPatterns = PatternSet.fromString(executor.getBranches());
+ for (RefInfo ref: project.getBranches()) {
+ String branchName = Preconditions.checkNotNull(GitUtils.ref2branch(ref.getRef().getName()));
+ if (descendants.contains(ref.getPeeledObj()) && branchPatterns.matches(matcher, branchName))
+ return executor;
+ }
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public JobExecutor getJobExecutor(String runningInstance) {
+ for (JobExecutor executor: getJobExecutors()) {
+ if (executor.isEnabled() && executor.isRunning(runningInstance))
+ return executor;
+ }
+ return null;
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.java
index 3f532b4dfe..c235165ed0 100644
--- a/core/src/main/java/io/onedev/server/model/Project.java
+++ b/core/src/main/java/io/onedev/server/model/Project.java
@@ -611,6 +611,16 @@ public class Project extends AbstractEntity {
objectIdCache.put(revision, Optional.fromNullable(objectId));
}
+ /**
+ * Get CI spec of specified commit
+ * @param commitId
+ * commit id to get CI spec for
+ * @return
+ * CI spec of specified commit, or <tt>null</tt> if no CI spec is defined and
+ * auto-detection also can not provide an appropriate CI spec
+ * @throws
+ * Exception when CI spec is defined but not valid
+ */
@Nullable
public CISpec getCISpec(ObjectId commitId) {
if (ciSpecCache == null)
diff --git a/core/src/main/java/io/onedev/server/model/Setting.java b/core/src/main/java/io/onedev/server/model/Setting.java
index 4ac9d9cc49..3b6e7098b4 100644
--- a/core/src/main/java/io/onedev/server/model/Setting.java
+++ b/core/src/main/java/io/onedev/server/model/Setting.java
@@ -23,7 +23,7 @@ public class Setting extends AbstractEntity {
private static final long serialVersionUID = 1L;
- public enum Key {SYSTEM, MAIL, BACKUP, SECURITY, AUTHENTICATOR, ISSUE, JOB_EXECUTOR};
+ public enum Key {SYSTEM, MAIL, BACKUP, SECURITY, AUTHENTICATOR, ISSUE, JOB_EXECUTORS};
/*
* Optimistic lock is necessary to ensure database integrity when update
diff --git a/core/src/main/java/io/onedev/server/model/support/FileProtection.java b/core/src/main/java/io/onedev/server/model/support/FileProtection.java
index 8276d08bbf..502ec11608 100644
--- a/core/src/main/java/io/onedev/server/model/support/FileProtection.java
+++ b/core/src/main/java/io/onedev/server/model/support/FileProtection.java
@@ -8,7 +8,7 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.util.OneContext;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.PathPatterns;
+import io.onedev.server.web.editable.annotation.Patterns;
import io.onedev.server.web.util.SuggestionUtils;
@Editable
@@ -21,7 +21,7 @@ public class FileProtection implements Serializable {
private String reviewRequirement;
@Editable(order=100, description="Specify space-separated paths to be protected. Use * or ? for wildcard match")
- @PathPatterns("getPathSuggestions")
+ @Patterns("getPathSuggestions")
@NotEmpty
public String getPaths() {
return paths;
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
index 2d064b0456..a2eb21f24b 100644
--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
@@ -6,15 +6,86 @@ import java.util.List;
import javax.annotation.Nullable;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.Patterns;
+import io.onedev.server.web.editable.annotation.ProjectPatterns;
@Editable
-public interface JobExecutor extends Serializable {
+public abstract class JobExecutor implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private boolean enabled = true;
+
+ private String projects;
+
+ private String branches;
+
+ private String jobs;
+
+ private String environments;
+
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ public void setEnabled(boolean enabled) {
+ this.enabled = enabled;
+ }
+
+ @Editable(order=100, name="Applicable Projects",
+ description="Optionally specify space-separated projects applicable for this executor. Use * or ? for wildcard match. "
+ + "Leave empty to match all projects")
+ @ProjectPatterns
+ public String getProjects() {
+ return projects;
+ }
+
+ public void setProjects(String projects) {
+ this.projects = projects;
+ }
+
+ @Editable(order=200, name="Applicable Branches",
+ description="Optionally specify space-separated branches applicable for this executor. When run a job "
+ + "against a particular commit, all branches able to reaching the commit will be checked. "
+ + "Use * or ? for wildcard match. Leave empty to match all branches.")
+ @Patterns
+ public String getBranches() {
+ return branches;
+ }
+
+ public void setBranches(String branches) {
+ this.branches = branches;
+ }
+
+ @Editable(order=300, name="Applicable Jobs",
+ description="Optionally specify space-separated jobs applicable for this executor. Use * or ? for wildcard match. "
+ + "Leave empty to match all jobs")
+ @Patterns
+ public String getJobs() {
+ return jobs;
+ }
+
+ public void setJobs(String jobs) {
+ this.jobs = jobs;
+ }
+
+ @Editable(order=400, name="Applicable Environments",
+ description="Optionally specify space-separated environments applicable for this executor. Use * or ? for wildcard match. "
+ + "Leave empty to match all images")
+ @Patterns
+ public String getEnvironments() {
+ return environments;
+ }
+
+ public void setEnvironments(String environments) {
+ this.environments = environments;
+ }
+
@Nullable
- String run(String image, List<String> commands);
+ public abstract String run(String environment, List<String> commands);
- boolean isRunning(String runningInstance);
+ public abstract boolean isRunning(String runningInstance);
- void stop(String runningInstance);
+ public abstract void stop(String runningInstance);
}
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/LocalhostExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/LocalDockerExecutor.java
similarity index 76%
rename from core/src/main/java/io/onedev/server/model/support/jobexecutor/LocalhostExecutor.java
rename to core/src/main/java/io/onedev/server/model/support/jobexecutor/LocalDockerExecutor.java
index c80908b5f8..7398ff842d 100644
--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/LocalhostExecutor.java
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/LocalDockerExecutor.java
@@ -5,12 +5,12 @@ import java.util.List;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=100)
-public class LocalhostExecutor implements JobExecutor {
+public class LocalDockerExecutor extends JobExecutor {
private static final long serialVersionUID = 1L;
@Override
- public String run(String image, List<String> commands) {
+ public String run(String environment, List<String> commands) {
return null;
}
diff --git a/core/src/main/java/io/onedev/server/util/validation/PathPatternsValidator.java b/core/src/main/java/io/onedev/server/util/validation/PatternsValidator.java
similarity index 75%
rename from core/src/main/java/io/onedev/server/util/validation/PathPatternsValidator.java
rename to core/src/main/java/io/onedev/server/util/validation/PatternsValidator.java
index 6e6fed7b15..47aa22e86e 100644
--- a/core/src/main/java/io/onedev/server/util/validation/PathPatternsValidator.java
+++ b/core/src/main/java/io/onedev/server/util/validation/PatternsValidator.java
@@ -6,12 +6,12 @@ import javax.validation.ConstraintValidatorContext;
import org.apache.commons.lang3.StringUtils;
import io.onedev.server.util.patternset.PatternSet;
-import io.onedev.server.web.editable.annotation.PathPatterns;
+import io.onedev.server.web.editable.annotation.Patterns;
-public class PathPatternsValidator implements ConstraintValidator<PathPatterns, String> {
+public class PatternsValidator implements ConstraintValidator<Patterns, String> {
@Override
- public void initialize(PathPatterns constaintAnnotation) {
+ public void initialize(Patterns constaintAnnotation) {
}
@Override
@@ -27,7 +27,7 @@ public class PathPatternsValidator implements ConstraintValidator<PathPatterns,
if (StringUtils.isNotBlank(e.getMessage()))
constraintContext.buildConstraintViolationWithTemplate(e.getMessage()).addConstraintViolation();
else
- constraintContext.buildConstraintViolationWithTemplate("Malformed path patterns").addConstraintViolation();
+ constraintContext.buildConstraintViolationWithTemplate("Malformed patterns").addConstraintViolation();
return false;
}
}
diff --git a/core/src/main/java/io/onedev/server/util/validation/ProjectPatternsValidator.java b/core/src/main/java/io/onedev/server/util/validation/ProjectPatternsValidator.java
new file mode 100644
index 0000000000..10acb3f287
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/validation/ProjectPatternsValidator.java
@@ -0,0 +1,35 @@
+package io.onedev.server.util.validation;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import org.apache.commons.lang3.StringUtils;
+
+import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.web.editable.annotation.ProjectPatterns;
+
+public class ProjectPatternsValidator implements ConstraintValidator<ProjectPatterns, String> {
+
+ @Override
+ public void initialize(ProjectPatterns constaintAnnotation) {
+ }
+
+ @Override
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value == null) {
+ return true;
+ } else {
+ try {
+ PatternSet.fromString(value);
+ return true;
+ } catch (Exception e) {
+ constraintContext.disableDefaultConstraintViolation();
+ if (StringUtils.isNotBlank(e.getMessage()))
+ constraintContext.buildConstraintViolationWithTemplate(e.getMessage()).addConstraintViolation();
+ else
+ constraintContext.buildConstraintViolationWithTemplate("Malformed project patterns").addConstraintViolation();
+ return false;
+ }
+ }
+ }
+}
diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
index 6a43cfc305..68f8ec9fec 100644
--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -22,7 +22,7 @@ import io.onedev.server.web.page.admin.issuesetting.DefaultQueryListPage;
import io.onedev.server.web.page.admin.issuesetting.DefaultStateTransitionsPage;
import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;
import io.onedev.server.web.page.admin.issuesetting.IssueStateListPage;
-import io.onedev.server.web.page.admin.jobexecutor.JobExecutorPage;
+import io.onedev.server.web.page.admin.jobexecutors.JobExecutorPage;
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;
import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;
diff --git a/core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java
index 85d32cd72f..5b44880e27 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java
@@ -40,9 +40,14 @@ public abstract class PatternSetAssistBehavior extends ANTLRAssistBehavior {
else if (token.getType() == PatternSetLexer.NQuoted)
matches.add(token.getText());
}
-
+
+ String unmatched = terminalExpect.getUnmatchedText();
if (spec.getRuleName().equals("NQuoted")) {
- return suggest(terminalExpect.getUnmatchedText())
+ List<InputSuggestion> suggestions = suggest(unmatched);
+ int index = "*".indexOf(unmatched);
+ if (index != -1)
+ suggestions.add(new InputSuggestion("*", "all", new Range(index, unmatched.length())));
+ return suggestions
.stream()
.filter(it->!matches.contains(it.getContent()))
.map(it->{
@@ -58,7 +63,7 @@ public abstract class PatternSetAssistBehavior extends ANTLRAssistBehavior {
}
})
.collect(Collectors.toList());
- } else if (spec.getRuleName().equals("Quoted") && terminalExpect.getUnmatchedText().startsWith("\"")) {
+ } else if (spec.getRuleName().equals("Quoted") && unmatched.startsWith("\"")) {
return new FenceAware(codeAssist.getGrammar(), "\"", "\"") {
@Override
diff --git a/core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java
index 6e69323de2..f2b74529bf 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java
@@ -10,6 +10,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxChannel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
@@ -27,6 +28,7 @@ import io.onedev.commons.codeassist.InputStatus;
import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.commons.utils.Range;
import io.onedev.commons.utils.RangeUtils;
+import io.onedev.server.util.OneContext;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.floating.AlignPlacement;
import io.onedev.server.web.component.floating.AlignTarget;
@@ -45,8 +47,9 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {
protected void onBind() {
super.onBind();
- Component inputField = getComponent();
- inputField.setOutputMarkupId(true);
+ Component input = getComponent();
+ input.add(AttributeAppender.append("class", "input-assist"));
+ input.setOutputMarkupId(true);
}
private int getLine(String content, int charIndex) {
@@ -132,7 +135,13 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {
if (inputCaret != null) {
InputStatus inputStatus = new InputStatus(inputContent, inputCaret);
- List<InputCompletion> suggestions = getSuggestions(new InputStatus(inputContent, inputCaret));
+ List<InputCompletion> suggestions;
+ OneContext.push(new OneContext(getComponent()));
+ try {
+ suggestions = getSuggestions(new InputStatus(inputContent, inputCaret));
+ } finally {
+ OneContext.pop();
+ }
int count = 0;
for (Iterator<InputCompletion> it = suggestions.iterator(); it.hasNext();) {
it.next();
diff --git a/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationMultiChoice.java b/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationMultiChoice.java
index 5ffd9cfe30..42012de800 100644
--- a/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationMultiChoice.java
+++ b/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationMultiChoice.java
@@ -8,6 +8,7 @@ import java.util.Map;
import java.util.stream.Collectors;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.web.component.select2.Select2MultiChoice;
import io.onedev.server.web.component.stringchoice.StringChoiceProvider;
@@ -19,22 +20,27 @@ public class ConfigurationMultiChoice extends Select2MultiChoice<String> {
private static final long serialVersionUID = 1L;
public ConfigurationMultiChoice(String id, IModel<Collection<String>> model) {
- super(id, model, new StringChoiceProvider(getChoices()));
+ super(id, model, new StringChoiceProvider(new LoadableDetachableModel<Map<String, String>>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected Map<String, String> load() {
+ Map<String, String> choices = new LinkedHashMap<>();
+ if (WicketUtils.getPage() instanceof ProjectPage) {
+ ProjectPage projectPage = (ProjectPage) WicketUtils.getPage();
+ List<String> configurations = projectPage.getProject().getConfigurations()
+ .stream().map(it->it.getName()).collect(Collectors.toList());
+ Collections.sort(configurations);
+ for (String configuration: configurations)
+ choices.put(configuration, configuration);
+ }
+ return choices;
+ }
+
+ }));
}
- private static Map<String, String> getChoices() {
- Map<String, String> choices = new LinkedHashMap<>();
- if (WicketUtils.getPage() instanceof ProjectPage) {
- ProjectPage projectPage = (ProjectPage) WicketUtils.getPage();
- List<String> configurations = projectPage.getProject().getConfigurations()
- .stream().map(it->it.getName()).collect(Collectors.toList());
- Collections.sort(configurations);
- for (String configuration: configurations)
- choices.put(configuration, configuration);
- }
- return choices;
- }
-
@Override
protected void onInitialize() {
super.onInitialize();
diff --git a/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationSingleChoice.java b/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationSingleChoice.java
index 1b45778c85..96642b59ef 100644
--- a/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationSingleChoice.java
+++ b/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationSingleChoice.java
@@ -7,6 +7,7 @@ import java.util.Map;
import java.util.stream.Collectors;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.web.component.select2.Select2Choice;
import io.onedev.server.web.component.stringchoice.StringChoiceProvider;
@@ -18,22 +19,27 @@ public class ConfigurationSingleChoice extends Select2Choice<String> {
private static final long serialVersionUID = 1L;
public ConfigurationSingleChoice(String id, IModel<String> model) {
- super(id, model, new StringChoiceProvider(getChoices()));
+ super(id, model, new StringChoiceProvider(new LoadableDetachableModel<Map<String, String>>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected Map<String, String> load() {
+ Map<String, String> choices = new LinkedHashMap<>();
+ if (WicketUtils.getPage() instanceof ProjectPage) {
+ ProjectPage projectPage = (ProjectPage) WicketUtils.getPage();
+ List<String> configurations = projectPage.getProject().getConfigurations()
+ .stream().map(it->it.getName()).collect(Collectors.toList());
+ Collections.sort(configurations);
+ for (String configuration: configurations)
+ choices.put(configuration, configuration);
+ }
+ return choices;
+ }
+
+ }));
}
- private static Map<String, String> getChoices() {
- Map<String, String> choices = new LinkedHashMap<>();
- if (WicketUtils.getPage() instanceof ProjectPage) {
- ProjectPage projectPage = (ProjectPage) WicketUtils.getPage();
- List<String> configurations = projectPage.getProject().getConfigurations()
- .stream().map(it->it.getName()).collect(Collectors.toList());
- Collections.sort(configurations);
- for (String configuration: configurations)
- choices.put(configuration, configuration);
- }
- return choices;
- }
-
@Override
protected void onInitialize() {
super.onInitialize();
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
index 9414909f9a..8531be31e0 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
@@ -16,6 +16,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.form.FormComponentPanel;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -88,13 +89,18 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
});
- List<Milestone> milestones = getProject().getSortedMilestones();
-
- Map<String, String> choices = new LinkedHashMap<>();
- for (Milestone milestone: milestones)
- choices.put(milestone.getName(), milestone.getName());
-
- milestoneChoice = new StringSingleChoice("milestone", Model.of(issue.getMilestoneName()), choices) {
+ milestoneChoice = new StringSingleChoice("milestone", Model.of(issue.getMilestoneName()), new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ Map<String, String> choices = new LinkedHashMap<>();
+ List<Milestone> milestones = getProject().getSortedMilestones();
+ for (Milestone milestone: milestones)
+ choices.put(milestone.getName(), milestone.getName());
+ return choices;
+ }
+
+ }) {
@Override
protected void onInitialize() {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 4e75379631..70d75503f5 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -260,9 +260,6 @@ public abstract class IssueListPanel extends GenericPanel<String> {
Fragment fragment = new Fragment(id, "listFieldsFrag", IssueListPanel.this);
Form<?> form = new Form<Void>("form");
fieldSet = getProject().getIssueSetting().getListFields(true);
- Map<String, String> choices = new LinkedHashMap<>();
- for (String fieldName: getGlobalIssueSetting().getFieldNames())
- choices.put(fieldName, fieldName);
form.add(new StringMultiChoice("fields", new IModel<Collection<String>>() {
@Override
@@ -279,7 +276,17 @@ public abstract class IssueListPanel extends GenericPanel<String> {
fieldSet = new HashSet<>(object);
}
- }, choices));
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ Map<String, String> choices = new LinkedHashMap<>();
+ for (String fieldName: getGlobalIssueSetting().getFieldNames())
+ choices.put(fieldName, fieldName);
+ return choices;
+ }
+
+ }));
form.add(new AjaxLink<Void>("close") {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.java
index 1fe2407e2c..6620baa61c 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.java
@@ -297,13 +297,20 @@ public abstract class IssueInfoPanel extends Panel {
Fragment fragment = new Fragment("milestone", "milestoneEditFrag", IssueInfoPanel.this);
Form<?> form = new Form<Void>("form");
- List<Milestone> milestones = getProject().getSortedMilestones();
-
- Map<String, String> choices = new LinkedHashMap<>();
- for (Milestone milestone: milestones)
- choices.put(milestone.getName(), milestone.getName());
+ IModel<Map<String, String>> choicesModel = new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ List<Milestone> milestones = getProject().getSortedMilestones();
+ Map<String, String> choices = new LinkedHashMap<>();
+ for (Milestone milestone: milestones)
+ choices.put(milestone.getName(), milestone.getName());
+ return choices;
+ }
+
+ };
- StringSingleChoice choice = new StringSingleChoice("milestone", new PropertyModel<String>(this, "milestoneName"), choices) {
+ StringSingleChoice choice = new StringSingleChoice("milestone", new PropertyModel<String>(this, "milestoneName"), choicesModel) {
@Override
protected void onInitialize() {
diff --git a/core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java
index c50c4e486a..9ad1689d74 100644
--- a/core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java
+++ b/core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java
@@ -6,6 +6,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
+import org.apache.wicket.model.IModel;
import org.json.JSONException;
import org.json.JSONWriter;
@@ -20,15 +21,21 @@ public class StringChoiceProvider extends ChoiceProvider<String> {
public static final String SPECIAL_CHOICE_PREFIX = "<$OneDevSpecialChoice$>";
- private final Map<String, String> choices;
+ private final IModel<Map<String, String>> choicesModel;
- public StringChoiceProvider(Map<String, String> choices) {
- this.choices = choices;
+ public StringChoiceProvider(IModel<Map<String, String>> choicesModel) {
+ this.choicesModel = choicesModel;
}
+ @Override
+ public void detach() {
+ choicesModel.detach();
+ super.detach();
+ }
+
@Override
public void toJson(String choice, JSONWriter writer) throws JSONException {
- String name = choices.get(choice);
+ String name = choicesModel.getObject().get(choice);
if (name == null)
name = choice;
writer.key("id").value(choice).key("name").value(name);
@@ -44,12 +51,12 @@ public class StringChoiceProvider extends ChoiceProvider<String> {
List<String> matched;
if (StringUtils.isNotBlank(term)) {
matched = new ArrayList<>();
- for (Map.Entry<String, String> entry: choices.entrySet()) {
+ for (Map.Entry<String, String> entry: choicesModel.getObject().entrySet()) {
if (entry.getValue().toLowerCase().startsWith(term))
matched.add(entry.getKey());
}
} else {
- matched = new ArrayList<>(choices.keySet());
+ matched = new ArrayList<>(choicesModel.getObject().keySet());
}
new ResponseFiller<String>(response).fill(matched, page, WebConstants.PAGE_SIZE);
}
diff --git a/core/src/main/java/io/onedev/server/web/component/stringchoice/StringMultiChoice.java b/core/src/main/java/io/onedev/server/web/component/stringchoice/StringMultiChoice.java
index 1b87f182e0..e9842712b2 100644
--- a/core/src/main/java/io/onedev/server/web/component/stringchoice/StringMultiChoice.java
+++ b/core/src/main/java/io/onedev/server/web/component/stringchoice/StringMultiChoice.java
@@ -10,8 +10,8 @@ import io.onedev.server.web.component.select2.Select2MultiChoice;
@SuppressWarnings("serial")
public class StringMultiChoice extends Select2MultiChoice<String> {
- public StringMultiChoice(String id, IModel<Collection<String>> model, Map<String, String> choices) {
- super(id, model, new StringChoiceProvider(choices));
+ public StringMultiChoice(String id, IModel<Collection<String>> model, IModel<Map<String, String>> choicesModel) {
+ super(id, model, new StringChoiceProvider(choicesModel));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.java b/core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.java
index 674c4ac717..67e1d7e2d1 100644
--- a/core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.java
+++ b/core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.java
@@ -9,8 +9,8 @@ import io.onedev.server.web.component.select2.Select2Choice;
@SuppressWarnings("serial")
public class StringSingleChoice extends Select2Choice<String> {
- public StringSingleChoice(String id, IModel<String> model, Map<String, String> choices) {
- super(id, model, new StringChoiceProvider(choices));
+ public StringSingleChoice(String id, IModel<String> model, IModel<Map<String, String>> choicesModel) {
+ super(id, model, new StringChoiceProvider(choicesModel));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/PageTabLink.java b/core/src/main/java/io/onedev/server/web/component/tabbable/PageTabLink.java
index 0a29803df7..ee949ed061 100644
--- a/core/src/main/java/io/onedev/server/web/component/tabbable/PageTabLink.java
+++ b/core/src/main/java/io/onedev/server/web/component/tabbable/PageTabLink.java
@@ -20,7 +20,7 @@ public class PageTabLink extends Panel {
}
protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new ViewStateAwarePageLink<Void>("link", pageClass);
+ return new ViewStateAwarePageLink<Void>(linkId, pageClass);
}
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
index 629b192b83..5c09d7e101 100644
--- a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
@@ -100,9 +100,9 @@ public class BeanEditor extends ValueEditor<Serializable> {
Set<String> checkedPropertyNames = new HashSet<>();
if (hasTransitiveDependency(propertyContext.getPropertyName(),
propertyUpdating.getPropertyName(), checkedPropertyNames)) {
- Component newPropertyContainer = newItem(propertyContainer.getId(), propertyIndex);
- propertyContainer.replaceWith(newPropertyContainer);
- propertyUpdating.getHandler().add(newPropertyContainer);
+ propertyUpdating.getHandler().add(propertyContainer);
+ String script = String.format("$('#%s').addClass('no-autofocus');", propertyContainer.getMarkupId());
+ propertyUpdating.getHandler().appendJavaScript(script);
}
}
validate();
diff --git a/core/src/main/java/io/onedev/server/web/editable/BranchPatternsEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/BranchPatternsEditSupport.java
index 49282c32b5..a0fd648a27 100644
--- a/core/src/main/java/io/onedev/server/web/editable/BranchPatternsEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/BranchPatternsEditSupport.java
@@ -24,7 +24,8 @@ public class BranchPatternsEditSupport implements EditSupport {
@Override
public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
Method propertyGetter = descriptor.getPropertyGetter();
- if (propertyGetter.getAnnotation(BranchPatterns.class) != null) {
+ BranchPatterns branchPatterns = propertyGetter.getAnnotation(BranchPatterns.class);
+ if (branchPatterns != null) {
if (propertyGetter.getReturnType() == String.class) {
return new PropertyContext<String>(descriptor) {
diff --git a/core/src/main/java/io/onedev/server/web/editable/PathPatternsEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.java
similarity index 76%
rename from core/src/main/java/io/onedev/server/web/editable/PathPatternsEditSupport.java
rename to core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.java
index c5f8182dd9..fc30029fb7 100644
--- a/core/src/main/java/io/onedev/server/web/editable/PathPatternsEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.java
@@ -10,20 +10,19 @@ import com.google.common.collect.Lists;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.commons.utils.ReflectionUtils;
-import io.onedev.server.util.OneContext;
import io.onedev.server.web.behavior.PatternSetAssistBehavior;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
-import io.onedev.server.web.editable.annotation.PathPatterns;
+import io.onedev.server.web.editable.annotation.Patterns;
import io.onedev.server.web.editable.string.StringPropertyEditor;
import io.onedev.server.web.editable.string.StringPropertyViewer;
@SuppressWarnings("serial")
-public class PathPatternsEditSupport implements EditSupport {
+public class PatternsEditSupport implements EditSupport {
@Override
public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
Method propertyGetter = descriptor.getPropertyGetter();
- PathPatterns pathPatterns = propertyGetter.getAnnotation(PathPatterns.class);
+ Patterns pathPatterns = propertyGetter.getAnnotation(Patterns.class);
if (pathPatterns != null) {
if (propertyGetter.getReturnType() == String.class) {
return new PropertyContext<String>(descriptor) {
@@ -46,13 +45,8 @@ public class PathPatternsEditSupport implements EditSupport {
protected List<InputSuggestion> suggest(String matchWith) {
String suggestionMethod = pathPatterns.value();
if (suggestionMethod.length() != 0) {
- OneContext.push(new OneContext(getComponent()));
- try {
- return (List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(
- descriptor.getBeanClass(), suggestionMethod, new Object[] {matchWith});
- } finally {
- OneContext.pop();
- }
+ return (List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(
+ descriptor.getBeanClass(), suggestionMethod, new Object[] {matchWith});
} else {
return Lists.newArrayList();
}
@@ -61,7 +55,7 @@ public class PathPatternsEditSupport implements EditSupport {
@Override
protected List<String> getHints(TerminalExpect terminalExpect) {
return Lists.newArrayList(
- "Path containing spaces or starting with dash needs to be quoted",
+ "Pattern containing spaces or starting with dash needs to be quoted",
"Use * or ? for wildcard match"
);
}
@@ -74,7 +68,7 @@ public class PathPatternsEditSupport implements EditSupport {
};
} else {
- throw new RuntimeException("Annotation 'PathPatterns' should be applied to property "
+ throw new RuntimeException("Annotation 'Patterns' should be applied to property "
+ "of type 'String'");
}
} else {
diff --git a/core/src/main/java/io/onedev/server/web/editable/ProjectPatternsEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/ProjectPatternsEditSupport.java
new file mode 100644
index 0000000000..cccba0c99c
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/ProjectPatternsEditSupport.java
@@ -0,0 +1,73 @@
+package io.onedev.server.web.editable;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.apache.wicket.model.IModel;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
+import io.onedev.server.web.behavior.PatternSetAssistBehavior;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
+import io.onedev.server.web.editable.annotation.ProjectPatterns;
+import io.onedev.server.web.editable.string.StringPropertyEditor;
+import io.onedev.server.web.editable.string.StringPropertyViewer;
+import io.onedev.server.web.util.SuggestionUtils;
+
+@SuppressWarnings("serial")
+public class ProjectPatternsEditSupport implements EditSupport {
+
+ @Override
+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
+ Method propertyGetter = descriptor.getPropertyGetter();
+ if (propertyGetter.getAnnotation(ProjectPatterns.class) != null) {
+ if (propertyGetter.getReturnType() == String.class) {
+ return new PropertyContext<String>(descriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, IModel<String> model) {
+ return new StringPropertyViewer(componentId, descriptor, model.getObject());
+ }
+
+ @Override
+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
+ return new StringPropertyEditor(componentId, descriptor, model) {
+
+ @Override
+ protected InputAssistBehavior getInputAssistBehavior() {
+ return new PatternSetAssistBehavior() {
+
+ @Override
+ protected List<InputSuggestion> suggest(String matchWith) {
+ return SuggestionUtils.suggestProjects(matchWith);
+ }
+
+ @Override
+ protected List<String> getHints(TerminalExpect terminalExpect) {
+ return Lists.newArrayList("Use * or ? for wildcard match");
+ }
+
+ };
+ }
+
+ };
+ }
+
+ };
+ } else {
+ throw new RuntimeException("Annotation 'ProjectPatterns' should be applied to property "
+ + "of type 'String'");
+ }
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public int getPriority() {
+ return DEFAULT_PRIORITY;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/editable/annotation/BranchPatterns.java b/core/src/main/java/io/onedev/server/web/editable/annotation/BranchPatterns.java
index 75f10d5ffd..64171adab5 100644
--- a/core/src/main/java/io/onedev/server/web/editable/annotation/BranchPatterns.java
+++ b/core/src/main/java/io/onedev/server/web/editable/annotation/BranchPatterns.java
@@ -15,6 +15,8 @@ import io.onedev.server.util.validation.BranchPatternsValidator;
@Constraint(validatedBy=BranchPatternsValidator.class)
public @interface BranchPatterns {
+ String value() default "";
+
String message() default "Malformed branch patterns";
Class<?>[] groups() default {};
diff --git a/core/src/main/java/io/onedev/server/web/editable/annotation/PathPatterns.java b/core/src/main/java/io/onedev/server/web/editable/annotation/Patterns.java
similarity index 72%
rename from core/src/main/java/io/onedev/server/web/editable/annotation/PathPatterns.java
rename to core/src/main/java/io/onedev/server/web/editable/annotation/Patterns.java
index 0fca6a80e3..3fe3872115 100644
--- a/core/src/main/java/io/onedev/server/web/editable/annotation/PathPatterns.java
+++ b/core/src/main/java/io/onedev/server/web/editable/annotation/Patterns.java
@@ -8,14 +8,14 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-import io.onedev.server.util.validation.PathPatternsValidator;
+import io.onedev.server.util.validation.PatternsValidator;
@Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
@Retention(RetentionPolicy.RUNTIME)
-@Constraint(validatedBy=PathPatternsValidator.class)
-public @interface PathPatterns {
+@Constraint(validatedBy=PatternsValidator.class)
+public @interface Patterns {
- String message() default "Malformed path patterns";
+ String message() default "Malformed patterns";
String value() default "";
diff --git a/core/src/main/java/io/onedev/server/web/editable/annotation/ProjectPatterns.java b/core/src/main/java/io/onedev/server/web/editable/annotation/ProjectPatterns.java
new file mode 100644
index 0000000000..6d545b5ce6
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/annotation/ProjectPatterns.java
@@ -0,0 +1,24 @@
+package io.onedev.server.web.editable.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+import io.onedev.server.util.validation.ProjectPatternsValidator;
+
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy=ProjectPatternsValidator.class)
+public @interface ProjectPatterns {
+
+ String message() default "Malformed project patterns";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java
index 610826fcf2..fc75b127b1 100644
--- a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java
@@ -9,6 +9,7 @@ import java.util.Map;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -37,36 +38,43 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {
protected void onInitialize() {
super.onInitialize();
- Map<String, String> choices;
-
- OneContext oneContext = new OneContext(this);
-
- OneContext.push(oneContext);
- try {
- getDescriptor().getDependencyPropertyNames().clear();
- io.onedev.server.web.editable.annotation.ChoiceProvider choiceProvider =
- descriptor.getPropertyGetter().getAnnotation(
- io.onedev.server.web.editable.annotation.ChoiceProvider.class);
- Preconditions.checkNotNull(choiceProvider);
- Object result = ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), choiceProvider.value());
- if (result instanceof List) {
- choices = new LinkedHashMap<>();
- for (String each: (List<String>)result)
- choices.put(each, each);
- } else {
- choices = (Map<String, String>)result;
- }
- } finally {
- OneContext.pop();
- }
-
List<String> selections;
if (getModelObject() != null)
selections = getModelObject();
else
selections = new ArrayList<>();
- input = new StringMultiChoice("input", Model.of(selections), choices) {
+ input = new StringMultiChoice("input", Model.of(selections), new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ Map<String, String> choices;
+
+ OneContext oneContext = new OneContext(MultiChoiceEditor.this);
+
+ OneContext.push(oneContext);
+ try {
+ getDescriptor().getDependencyPropertyNames().clear();
+ io.onedev.server.web.editable.annotation.ChoiceProvider choiceProvider =
+ descriptor.getPropertyGetter().getAnnotation(
+ io.onedev.server.web.editable.annotation.ChoiceProvider.class);
+ Preconditions.checkNotNull(choiceProvider);
+ Object result = ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), choiceProvider.value());
+ if (result instanceof List) {
+ choices = new LinkedHashMap<>();
+ for (String each: (List<String>)result)
+ choices.put(each, each);
+ } else {
+ choices = (Map<String, String>)result;
+ }
+ } finally {
+ OneContext.pop();
+ }
+
+ return choices;
+ }
+
+ }) {
@Override
protected void onInitialize() {
diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java
index 71ff12d286..8551f922dd 100644
--- a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java
@@ -8,6 +8,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -35,30 +36,36 @@ public class SingleChoiceEditor extends PropertyEditor<String> {
protected void onInitialize() {
super.onInitialize();
- Map<String, String> choices;
-
- OneContext oneContext = new OneContext(this);
-
- OneContext.push(oneContext);
- try {
- getDescriptor().getDependencyPropertyNames().clear();
- io.onedev.server.web.editable.annotation.ChoiceProvider choiceProvider =
- descriptor.getPropertyGetter().getAnnotation(
- io.onedev.server.web.editable.annotation.ChoiceProvider.class);
- Preconditions.checkNotNull(choiceProvider);
- Object result = ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), choiceProvider.value());
- if (result instanceof List) {
- choices = new LinkedHashMap<>();
- for (String each: (List<String>)result)
- choices.put(each, each);
- } else {
- choices = ((Map<String, String>)result);
- }
- } finally {
- OneContext.pop();
- }
+ input = new StringSingleChoice("input", Model.of(getModelObject()), new LoadableDetachableModel<Map<String, String>>() {
- input = new StringSingleChoice("input", Model.of(getModelObject()), choices) {
+ @Override
+ protected Map<String, String> load() {
+ Map<String, String> choices;
+
+ OneContext oneContext = new OneContext(SingleChoiceEditor.this);
+
+ OneContext.push(oneContext);
+ try {
+ getDescriptor().getDependencyPropertyNames().clear();
+ io.onedev.server.web.editable.annotation.ChoiceProvider choiceProvider =
+ descriptor.getPropertyGetter().getAnnotation(
+ io.onedev.server.web.editable.annotation.ChoiceProvider.class);
+ Preconditions.checkNotNull(choiceProvider);
+ Object result = ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), choiceProvider.value());
+ if (result instanceof List) {
+ choices = new LinkedHashMap<>();
+ for (String each: (List<String>)result)
+ choices.put(each, each);
+ } else {
+ choices = ((Map<String, String>)result);
+ }
+ } finally {
+ OneContext.pop();
+ }
+ return choices;
+ }
+
+ }) {
@Override
protected void onInitialize() {
diff --git a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java
index 8d845bb0c3..8f94d5f800 100644
--- a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java
@@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -39,19 +40,25 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {
protected void onInitialize() {
super.onInitialize();
- Map<String, String> choices = new LinkedHashMap<>();
- for (Iterator<?> it = EnumSet.allOf(enumClass).iterator(); it.hasNext();) {
- Enum<?> value = (Enum<?>) it.next();
- choices.put(value.name(), getDisplayValue(value.toString()));
- }
-
String selection;
if (getModelObject() != null)
selection = getModelObject().name();
else
selection = null;
- input = new StringSingleChoice("input", Model.of(selection), choices) {
+ input = new StringSingleChoice("input", Model.of(selection), new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ Map<String, String> choices = new LinkedHashMap<>();
+ for (Iterator<?> it = EnumSet.allOf(enumClass).iterator(); it.hasNext();) {
+ Enum<?> value = (Enum<?>) it.next();
+ choices.put(value.name(), getDisplayValue(value.toString()));
+ }
+ return choices;
+ }
+
+ }) {
@Override
protected void onInitialize() {
diff --git a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java
index 0b84fc0f77..dd8095444c 100644
--- a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java
@@ -11,6 +11,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -42,19 +43,25 @@ public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {
protected void onInitialize() {
super.onInitialize();
- Map<String, String> choices = new LinkedHashMap<>();
- for (Iterator<?> it = EnumSet.allOf(enumClass).iterator(); it.hasNext();) {
- Enum<?> value = (Enum<?>) it.next();
- choices.put(value.name(), getDisplayValue(value.toString()));
- }
-
List<String> selections = new ArrayList<>();
if (getModelObject() != null) {
for (Enum<?> each: getModelObject())
selections.add(each.name());
}
- input = new StringMultiChoice("input", Model.of(selections), choices) {
+ input = new StringMultiChoice("input", Model.of(selections), new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ Map<String, String> choices = new LinkedHashMap<>();
+ for (Iterator<?> it = EnumSet.allOf(enumClass).iterator(); it.hasNext();) {
+ Enum<?> value = (Enum<?>) it.next();
+ choices.put(value.name(), getDisplayValue(value.toString()));
+ }
+ return choices;
+ }
+
+ }) {
@Override
protected void onInitialize() {
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java
index 4b785e4373..a2807007b9 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java
@@ -319,6 +319,7 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {
}
};
+ link.add(newLabel("label"));
add(link);
}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.html b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.html
deleted file mode 100644
index 21d4a4f2b1..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<wicket:extend>
- <div class="page-title">Job Executor</div>
- <form wicket:id="jobExecutor" class="job-executor leave-confirm">
- <div wicket:id="editor"></div>
- <div class="actions">
- <input wicket:id="save" type="submit" class="btn btn-primary dirty-aware" value="Save setting">
- </div>
- </form>
-</wicket:extend>
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java
deleted file mode 100644
index 321ad55964..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.onedev.server.web.page.admin.jobexecutor;
-
-import java.io.Serializable;
-
-import org.apache.wicket.markup.html.form.Button;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.web.editable.PropertyContext;
-import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.web.page.admin.AdministrationPage;
-
-@SuppressWarnings("serial")
-public class JobExecutorPage extends AdministrationPage {
-
- public JobExecutorPage(PageParameters params) {
- super(params);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- JobExecutorBean bean = new JobExecutorBean();
- bean.setJobExecutor(OneDev.getInstance(SettingManager.class).getJobExecutor());
-
- PropertyEditor<Serializable> editor = PropertyContext.editBean("editor", bean, "jobExecutor");
- editor.setOutputMarkupId(true);
- Button saveButton = new Button("save") {
-
- @Override
- public void onSubmit() {
- super.onSubmit();
-
- OneDev.getInstance(SettingManager.class).saveJobExecutor(bean.getJobExecutor());
- getSession().success("Job executor setting has been saved");
- }
-
- };
-
- Form<?> form = new Form<Void>("jobExecutor");
-
- form.add(editor);
- form.add(saveButton);
-
- add(form);
- }
-
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorBean.java
similarity index 75%
rename from core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java
rename to core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorBean.java
index 0cac89dc79..6ffd7ccec4 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorBean.java
@@ -1,10 +1,11 @@
-package io.onedev.server.web.page.admin.jobexecutor;
+package io.onedev.server.web.page.admin.jobexecutors;
import java.io.Serializable;
+import javax.validation.constraints.NotNull;
+
import io.onedev.server.model.support.jobexecutor.JobExecutor;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
@Editable
public class JobExecutorBean implements Serializable {
@@ -14,7 +15,7 @@ public class JobExecutorBean implements Serializable {
private JobExecutor jobExecutor;
@Editable
- @NameOfEmptyValue("No job executor")
+ @NotNull
public JobExecutor getJobExecutor() {
return jobExecutor;
}
@@ -22,5 +23,5 @@ public class JobExecutorBean implements Serializable {
public void setJobExecutor(JobExecutor jobExecutor) {
this.jobExecutor = jobExecutor;
}
-
+
}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditor.html b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditor.html
new file mode 100644
index 0000000000..686f19ab1c
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditor.html
@@ -0,0 +1,10 @@
+<wicket:panel>
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="feedback"></div>
+ <div wicket:id="editor"></div>
+ <div class="actions">
+ <button wicket:id="save" class="btn btn-primary dirty-aware">Save</button> &nbsp;
+ <button wicket:id="cancel" class="btn btn-default">Cancel</button>
+ </div>
+ </form>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditor.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditor.java
new file mode 100644
index 0000000000..1be9df43f5
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditor.java
@@ -0,0 +1,66 @@
+package io.onedev.server.web.page.admin.jobexecutors;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.Panel;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
+import io.onedev.server.web.editable.PropertyContext;
+
+@SuppressWarnings("serial")
+abstract class JobExecutorEditor extends Panel {
+
+ private final JobExecutor executor;
+
+ public JobExecutorEditor(String id, JobExecutor executor) {
+ super(id);
+
+ this.executor = executor;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ setOutputMarkupId(true);
+
+ Form<?> form = new Form<Void>("form");
+ form.add(new NotificationPanel("feedback", form));
+
+ JobExecutorBean bean = new JobExecutorBean();
+ bean.setJobExecutor(executor);
+ form.add(PropertyContext.editBean("editor", bean, "jobExecutor"));
+
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ onSave(target, bean.getJobExecutor());
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(form);
+ }
+
+ });
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+ add(form);
+ }
+
+ protected abstract void onSave(AjaxRequestTarget target, JobExecutor executor);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.html b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.html
new file mode 100644
index 0000000000..8007a6d4d1
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.html
@@ -0,0 +1,24 @@
+<wicket:extend>
+ <div class="page-title">Job Executors</div>
+ <div wicket:id="jobExecutorSetting" class="panel-list">
+ <ul class="list-unstyled protections">
+ <li wicket:id="executors" class="executor"><div wicket:id="executor"></div></li>
+ </ul>
+ <div wicket:id="newExecutor"></div>
+ <div class="help-block">
+ <i class="fa fa-info-circle"></i> Define job executors here. For a given job, the first
+ matching job executor will be used
+ </div>
+ </div>
+ <wicket:fragment wicket:id="editNewFrag">
+ <div class="executor panel panel-default">
+ <div class="panel-heading"><div class="panel-title">Edit Executor</div></div>
+ <div class="panel-body">
+ <div wicket:id="editor"></div>
+ </div>
+ </div>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="addNewLinkFrag">
+ <a wicket:id="link" class="add-new"><i class="fa fa-plus-circle fa-lg"></i> Add Executor</a>
+ </wicket:fragment>
+</wicket:extend>
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.java
new file mode 100644
index 0000000000..ef8c43791a
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.java
@@ -0,0 +1,128 @@
+package io.onedev.server.web.page.admin.jobexecutors;
+
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
+import io.onedev.server.web.behavior.sortable.SortBehavior;
+import io.onedev.server.web.behavior.sortable.SortPosition;
+import io.onedev.server.web.page.admin.AdministrationPage;
+
+@SuppressWarnings("serial")
+public class JobExecutorPage extends AdministrationPage {
+
+ private WebMarkupContainer container;
+
+ public JobExecutorPage(PageParameters params) {
+ super(params);
+ }
+
+ private SettingManager getSettingManager() {
+ return OneDev.getInstance(SettingManager.class);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ container = new WebMarkupContainer("jobExecutorSetting");
+ container.setOutputMarkupId(true);
+ add(container);
+ container.add(new ListView<JobExecutor>("executors", new AbstractReadOnlyModel<List<JobExecutor>>() {
+
+ @Override
+ public List<JobExecutor> getObject() {
+ return getSettingManager().getJobExecutors();
+ }
+
+ }) {
+
+ @Override
+ protected void populateItem(ListItem<JobExecutor> item) {
+ item.add(new JobExecutorPanel("executor", item.getModelObject()) {
+
+ @Override
+ protected void onDelete(AjaxRequestTarget target) {
+ List<JobExecutor> executors = getSettingManager().getJobExecutors();
+ executors.remove(item.getIndex());
+ getSettingManager().saveJobExecutors(executors);
+ target.add(container);
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, JobExecutor executor) {
+ List<JobExecutor> executors = getSettingManager().getJobExecutors();
+ executors.set(item.getIndex(), executor);
+ getSettingManager().saveJobExecutors(executors);
+ }
+
+ });
+ }
+
+ });
+
+ container.add(new SortBehavior() {
+
+ @Override
+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ List<JobExecutor> executors = getSettingManager().getJobExecutors();
+ JobExecutor executor = executors.get(from.getItemIndex());
+ executors.set(from.getItemIndex(), executors.set(to.getItemIndex(), executor));
+ getSettingManager().saveJobExecutors(executors);
+
+ target.add(container);
+ }
+
+ }.items("li.executor"));
+
+ container.add(newAddNewFrag());
+ }
+
+ private Component newAddNewFrag() {
+ Fragment fragment = new Fragment("newExecutor", "addNewLinkFrag", this);
+ fragment.add(new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ Fragment fragment = new Fragment("newExecutor", "editNewFrag", getPage());
+ fragment.setOutputMarkupId(true);
+ fragment.add(new JobExecutorEditor("editor", null) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, JobExecutor executor) {
+ List<JobExecutor> executors = getSettingManager().getJobExecutors();
+ executors.add(executor);
+ getSettingManager().saveJobExecutors(executors);
+ container.replace(newAddNewFrag());
+ target.add(container);
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ Component newAddNewFrag = newAddNewFrag();
+ container.replace(newAddNewFrag);
+ target.add(newAddNewFrag);
+ }
+
+ });
+ container.replace(fragment);
+ target.add(fragment);
+ }
+
+ });
+ fragment.setOutputMarkupId(true);
+ return fragment;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPanel.html b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPanel.html
new file mode 100644
index 0000000000..334ac77adf
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPanel.html
@@ -0,0 +1,14 @@
+<wicket:panel>
+ <div class="job-executor panel panel-default">
+ <div class="panel-heading">
+ <span class="drag-indicator"><i class="fa fa-reorder"></i></span>
+ <a wicket:id="edit" title="Edit this executor"><i class="fa fa-pencil"></i></a>
+ <a wicket:id="delete" title="Delete this executor"><i class="fa fa-trash"></i></a>
+ <input wicket:id="enable" type="checkbox">
+ <label wicket:id="enableLabel">Enable</label>
+ </div>
+ <div class="panel-body">
+ <div wicket:id="executor"></div>
+ </div>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPanel.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPanel.java
new file mode 100644
index 0000000000..96ff3ca359
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPanel.java
@@ -0,0 +1,116 @@
+package io.onedev.server.web.page.admin.jobexecutors;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
+
+@SuppressWarnings("serial")
+abstract class JobExecutorPanel extends Panel {
+
+ private final JobExecutor executor;
+
+ public JobExecutorPanel(String id, JobExecutor executor) {
+ super(id);
+
+ this.executor = executor;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new AjaxLink<Void>("edit") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ JobExecutorEditor editor = new JobExecutorEditor("executor", executor) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, JobExecutor executor) {
+ JobExecutorPanel.this.onSave(target, executor);
+ Component executorViewer = BeanContext.viewBean("executor", executor).setOutputMarkupId(true);
+ JobExecutorPanel.this.replace(executorViewer);
+ target.add(executorViewer);
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ Component executorViewer = BeanContext.viewBean("executor", executor).setOutputMarkupId(true);
+ JobExecutorPanel.this.replace(executorViewer);
+ target.add(executorViewer);
+ }
+
+ };
+ JobExecutorPanel.this.replace(editor);
+ target.add(editor);
+ }
+
+ });
+
+ add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete this executor?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onDelete(target);
+ }
+
+ });
+
+ AjaxCheckBox enableCheck;
+ add(enableCheck = new AjaxCheckBox("enable", Model.of(executor.isEnabled())) {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ executor.setEnabled(!executor.isEnabled());
+ onSave(target, executor);
+ target.add(JobExecutorPanel.this);
+ }
+
+ });
+ add(new WebMarkupContainer("enableLabel") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.put("for", enableCheck.getMarkupId(true));
+ }
+
+ });
+
+ add(BeanContext.viewBean("executor", executor).setOutputMarkupId(true));
+
+ add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ return !executor.isEnabled()? "disabled": "";
+ }
+
+ }));
+
+ setOutputMarkupId(true);
+ }
+
+ protected abstract void onDelete(AjaxRequestTarget target);
+
+ protected abstract void onSave(AjaxRequestTarget target, JobExecutor executor);
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.css
index 80bf877556..4518a26084 100644
--- a/core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -704,4 +704,37 @@ td.no-elements {
td.ellipsis {
font-size: 16px;
-}
\ No newline at end of file
+}
+
+.panel-list .drag-indicator {
+ margin-right: 8px;
+}
+.panel-list .panel-heading a {
+ color: #444;
+ margin-right: 8px;
+}
+.panel-list .panel-heading input {
+ vertical-align: text-top;
+}
+.panel-list input[type="checkbox"]+label {
+ font-weight: normal;
+}
+.panel-list .add-new {
+ display: block;
+ padding: 16px;
+ background: #F2F2F2;
+ border: 1px solid #DDD;
+ border-radius: 4px;
+ font-size: 16px;
+ color: #444;
+ margin-bottom: 16px;
+}
+.panel-list a.add-new:hover {
+ text-decoration: none;
+ background-color: #EBEBEB;
+ border-color: #ADADAD;
+}
+
+.panel-list .disabled .panel {
+ color: #999;
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.js b/core/src/main/java/io/onedev/server/web/page/base/base.js
index ad1db0dd5b..539056594f 100644
--- a/core/src/main/java/io/onedev/server/web/page/base/base.js
+++ b/core/src/main/java/io/onedev/server/web/page/base/base.js
@@ -300,7 +300,9 @@ onedev.server = {
var $focusable = $inError.find(focusibleSelector).addBack(focusibleSelector);
if ($focusable.hasClass("CodeMirror") && $this[0].CodeMirror.options.readOnly == false) {
$focusable[0].CodeMirror.focus();
- } else if ($focusable.length != 0 && $focusable.closest(".select2-container").length == 0) {
+ } else if ($focusable.length != 0
+ && $focusable.closest(".select2-container").length == 0
+ && !$focusable.hasClass("input-assist")) {
$focusable.focus();
} else {
$inError.scrollIntoView();
@@ -313,7 +315,8 @@ onedev.server = {
$this[0].CodeMirror.focus();
} else if ($this.closest(".select2-container").length == 0
&& $this.attr("readonly") != "readonly"
- && $this.attr("disabled") != "disabled") {
+ && $this.attr("disabled") != "disabled"
+ && !$this.hasClass("input-assist")) {
$this.focus();
}
return false;
diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
index 5af307ad22..379475ca64 100644
--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
@@ -32,7 +32,7 @@
<li wicket:id="issueSetting"><a wicket:id="link"><i class="fa fa-fw fa-bug"></i> Issue Setting</a></li>
<li wicket:id="mailSetting"><a wicket:id="link"><i class="fa fa-fw fa-envelope"></i> Mail Setting</a></li>
<li role="separator" class="divider"></li>
- <li wicket:id="jobExecutor"><a wicket:id="link"><i class="fa fa-fw fa-cogs"></i> Job Executor</a></li>
+ <li wicket:id="jobExecutors"><a wicket:id="link"><i class="fa fa-fw fa-cogs"></i> Job Executors</a></li>
<li role="separator" class="divider"></li>
<li wicket:id="databaseBackup"><a wicket:id="link"><i class="fa fa-fw fa-database"></i> Database Backup</a></li>
<li wicket:id="serverLog"><a wicket:id="link"><i class="fa fa-fw fa-file-text-o"></i> Server Log</a></li>
diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 2bdd6bb9b7..67cba9054e 100644
--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -37,7 +37,7 @@ import io.onedev.server.web.page.admin.group.GroupPage;
import io.onedev.server.web.page.admin.group.NewGroupPage;
import io.onedev.server.web.page.admin.issuesetting.GlobalIssueSettingPage;
import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;
-import io.onedev.server.web.page.admin.jobexecutor.JobExecutorPage;
+import io.onedev.server.web.page.admin.jobexecutors.JobExecutorPage;
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;
import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;
@@ -131,7 +131,7 @@ public abstract class LayoutPage extends BasePage {
if (getPage() instanceof AuthenticatorPage)
item.add(AttributeAppender.append("class", "active"));
- administrationContainer.add(item = new WebMarkupContainer("jobExecutor"));
+ administrationContainer.add(item = new WebMarkupContainer("jobExecutors"));
item.add(new ViewStateAwarePageLink<Void>("link", JobExecutorPage.class));
if (getPage() instanceof JobExecutorPage)
item.add(AttributeAppender.append("class", "active"));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.java
index 57ba8a1635..24626d66e6 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.java
@@ -10,6 +10,7 @@ import org.apache.wicket.Session;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
@@ -43,10 +44,6 @@ public class PromptFieldsUponIssueOpenSettingPage extends IssueSettingPage {
};
- Map<String, String> choices = new LinkedHashMap<>();
- for (String fieldName: getGlobalSetting().getFieldNames())
- choices.put(fieldName, fieldName);
-
form.add(new StringMultiChoice("fields", new IModel<Collection<String>>() {
@Override
@@ -63,7 +60,17 @@ public class PromptFieldsUponIssueOpenSettingPage extends IssueSettingPage {
fieldSet = new HashSet<>(object);
}
- }, choices));
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ Map<String, String> choices = new LinkedHashMap<>();
+ for (String fieldName: getGlobalSetting().getFieldNames())
+ choices.put(fieldName, fieldName);
+ return choices;
+ }
+
+ }));
form.add(new Link<Void>("useDefault") {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css b/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
index 0f5d39d101..a5c12c7bfd 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
@@ -42,38 +42,6 @@ body.BranchProtectionPage, body.WebHooksPage {
#project-setting .general-setting form .delete {
margin-right: 0;
}
-#project-setting .panel-list .drag-indicator {
- margin-right: 8px;
-}
-#project-setting .panel-list .panel-heading a {
- color: #444;
- margin-right: 8px;
-}
-#project-setting .panel-list .panel-heading input {
- vertical-align: text-top;
-}
-#project-setting .panel-list input[type="checkbox"]+label {
- font-weight: normal;
-}
-#project-setting .panel-list .add-new {
- display: block;
- padding: 16px;
- background: #F2F2F2;
- border: 1px solid #DDD;
- border-radius: 4px;
- font-size: 16px;
- color: #444;
- margin-bottom: 16px;
-}
-#project-setting .panel-list a.add-new:hover {
- text-decoration: none;
- background-color: #EBEBEB;
- border-color: #ADADAD;
-}
-
-#project-setting .disabled .panel {
- color: #999;
-}
#project-setting .commit-message-transform>label {
float: left;
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 66db87025c..fd503a5059 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -1,11 +1,18 @@
package io.onedev.server.web.page.test;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.git.RefInfo;
+import io.onedev.server.model.Project;
import io.onedev.server.web.page.base.BasePage;
@SuppressWarnings("serial")
@@ -22,6 +29,12 @@ public class TestPage extends BasePage {
@Override
public void onClick() {
+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
+ List<RefInfo> refInfos = new ArrayList<>();
+ for (Project project: projectManager.query()) {
+ refInfos.addAll(project.getBranches());
+ }
+ System.out.println(refInfos.size());
}
});
diff --git a/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index 65de2a140f..115b4b4f13 100644
--- a/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -24,15 +24,18 @@ import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
import io.onedev.server.model.Build;
import io.onedev.server.model.Group;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPrivilege;
import io.onedev.server.util.facade.ConfigurationFacade;
+import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
@@ -62,6 +65,19 @@ public class SuggestionUtils {
return suggestions;
}
+ public static List<InputSuggestion> suggestProjects(String matchWith) {
+ matchWith = matchWith.toLowerCase();
+ int numSuggestions = 0;
+ List<InputSuggestion> suggestions = new ArrayList<>();
+ User user = SecurityUtils.getUser();
+ for (ProjectFacade project: OneDev.getInstance(ProjectManager.class).getAccessibleProjects(user)) {
+ int index = project.getName().toLowerCase().indexOf(matchWith);
+ if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS)
+ suggestions.add(new InputSuggestion(project.getName(), new Range(index, index+matchWith.length())));
+ }
+ return suggestions;
+ }
+
public static List<InputSuggestion> suggestTags(Project project, String matchWith) {
matchWith = matchWith.toLowerCase();
int numSuggestions = 0;
diff --git a/product/src/test/java/io/onedev/server/product/Test.java b/product/src/test/java/io/onedev/server/product/Test.java
index 25b80b8b77..f52a643bed 100644
--- a/product/src/test/java/io/onedev/server/product/Test.java
+++ b/product/src/test/java/io/onedev/server/product/Test.java
@@ -5,7 +5,7 @@ import java.io.IOException;
public class Test {
@org.junit.Test
- public void test() throws IOException {
+ public void test() throws IOException {
}
}
\ No newline at end of file