Skip to content

The Unified and Autonomous Development Platform

Fix issue #1156 - LFS files not transferred when send pull request between different projects

Robin Shen2f06d31b5d1a
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.java
index e0a69bd3d3..cd4d238ea0 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.java
@@ -59,6 +59,21 @@ public class PushRepository extends SyncRepository {
if (remoteCommitId.get() != null) {
git.clearArgs();
git.addArgs("fetch", remoteUrl, remoteCommitId.get());
+ git.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.log(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.warning(line);
+ }
+
+ }).checkReturnCode();
Repository repository = OneDev.getInstance(ProjectManager.class)
.getRepository(project.getId());
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
index f44223c0b8..1ed0ad426e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
@@ -1,89 +1,95 @@
-package io.onedev.server.entitymanager.impl;
-
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.eclipse.jgit.lib.ObjectId;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
-
-import io.onedev.server.entitymanager.PullRequestCommentManager;
-import io.onedev.server.entitymanager.PullRequestUpdateManager;
-import io.onedev.server.event.ListenerRegistry;
-import io.onedev.server.event.project.pullrequest.PullRequestUpdated;
-import io.onedev.server.git.service.GitService;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestUpdate;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.BaseEntityManager;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.persistence.dao.EntityCriteria;
-
-@Singleton
-public class DefaultPullRequestUpdateManager extends BaseEntityManager<PullRequestUpdate>
- implements PullRequestUpdateManager {
-
- private final GitService gitService;
-
- private final ListenerRegistry listenerRegistry;
-
- @Inject
- public DefaultPullRequestUpdateManager(Dao dao, ListenerRegistry listenerRegistry,
- PullRequestCommentManager commentManager, GitService gitService) {
- super(dao);
-
- this.gitService = gitService;
- this.listenerRegistry = listenerRegistry;
- }
-
- @Transactional
- @Override
- public void save(PullRequestUpdate update) {
- super.save(update);
- PullRequest request = update.getRequest();
- if (!request.getTargetProject().equals(request.getSourceProject())) {
- gitService.push(request.getSourceProject(), request.getTargetProject(),
- update.getHeadCommitHash() + ":" + update.getHeadRef());
- } else {
- ObjectId headCommitId = ObjectId.fromString(update.getHeadCommitHash());
- gitService.updateRef(request.getTargetProject(), update.getHeadRef(), headCommitId, null);
- }
- }
-
- @Transactional
- @Override
- public void checkUpdate(PullRequest request) {
- if (!request.getLatestUpdate().getHeadCommitHash().equals(request.getSource().getObjectName())) {
- ObjectId mergeBase = gitService.getMergeBase(
- request.getTargetProject(), request.getTarget().getObjectId(),
- request.getSourceProject(), request.getSource().getObjectId());
- if (mergeBase != null) {
- PullRequestUpdate update = new PullRequestUpdate();
- update.setRequest(request);
- update.setHeadCommitHash(request.getSource().getObjectName());
- update.setTargetHeadCommitHash(request.getTarget().getObjectName());
- request.getUpdates().add(update);
- save(update);
-
- gitService.updateRef(request.getTargetProject(), request.getHeadRef(),
- ObjectId.fromString(request.getLatestUpdate().getHeadCommitHash()), null);
-
- listenerRegistry.post(new PullRequestUpdated(update));
- }
- }
- }
-
- @Sessional
- @Override
- public List<PullRequestUpdate> queryAfter(Long projectId, Long afterUpdateId, int count) {
- EntityCriteria<PullRequestUpdate> criteria = newCriteria();
- criteria.createCriteria("request").add(Restrictions.eq("targetProject.id", projectId));
- criteria.add(Restrictions.gt("id", afterUpdateId));
- criteria.addOrder(Order.asc("id"));
- return query(criteria, 0, count);
- }
-
-}
+package io.onedev.server.entitymanager.impl;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.eclipse.jgit.lib.ObjectId;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+
+import io.onedev.server.entitymanager.PullRequestCommentManager;
+import io.onedev.server.entitymanager.PullRequestUpdateManager;
+import io.onedev.server.event.ListenerRegistry;
+import io.onedev.server.event.project.pullrequest.PullRequestUpdated;
+import io.onedev.server.git.service.GitService;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestUpdate;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.persistence.dao.EntityCriteria;
+
+@Singleton
+public class DefaultPullRequestUpdateManager extends BaseEntityManager<PullRequestUpdate>
+ implements PullRequestUpdateManager {
+
+ private final GitService gitService;
+
+ private final ListenerRegistry listenerRegistry;
+
+ @Inject
+ public DefaultPullRequestUpdateManager(Dao dao, ListenerRegistry listenerRegistry,
+ PullRequestCommentManager commentManager, GitService gitService) {
+ super(dao);
+
+ this.gitService = gitService;
+ this.listenerRegistry = listenerRegistry;
+ }
+
+ @Transactional
+ @Override
+ public void save(PullRequestUpdate update) {
+ super.save(update);
+ PullRequest request = update.getRequest();
+ if (!request.getTargetProject().equals(request.getSourceProject())) {
+ if (request.getTargetProject().findPullRequestWithLFS()) {
+ gitService.pushLfsObjects(
+ request.getSourceProject(), request.getSourceRef(),
+ request.getTargetProject(), update.getHeadRef(),
+ ObjectId.fromString(update.getHeadCommitHash()));
+ }
+ gitService.push(request.getSourceProject(), update.getHeadCommitHash(),
+ request.getTargetProject(), update.getHeadRef());
+ } else {
+ ObjectId headCommitId = ObjectId.fromString(update.getHeadCommitHash());
+ gitService.updateRef(request.getTargetProject(), update.getHeadRef(), headCommitId, null);
+ }
+ }
+
+ @Transactional
+ @Override
+ public void checkUpdate(PullRequest request) {
+ if (!request.getLatestUpdate().getHeadCommitHash().equals(request.getSource().getObjectName())) {
+ ObjectId mergeBase = gitService.getMergeBase(
+ request.getTargetProject(), request.getTarget().getObjectId(),
+ request.getSourceProject(), request.getSource().getObjectId());
+ if (mergeBase != null) {
+ PullRequestUpdate update = new PullRequestUpdate();
+ update.setRequest(request);
+ update.setHeadCommitHash(request.getSource().getObjectName());
+ update.setTargetHeadCommitHash(request.getTarget().getObjectName());
+ request.getUpdates().add(update);
+ save(update);
+
+ gitService.updateRef(request.getTargetProject(), request.getHeadRef(),
+ ObjectId.fromString(request.getLatestUpdate().getHeadCommitHash()), null);
+
+ listenerRegistry.post(new PullRequestUpdated(update));
+ }
+ }
+ }
+
+ @Sessional
+ @Override
+ public List<PullRequestUpdate> queryAfter(Long projectId, Long afterUpdateId, int count) {
+ EntityCriteria<PullRequestUpdate> criteria = newCriteria();
+ criteria.createCriteria("request").add(Restrictions.eq("targetProject.id", projectId));
+ criteria.add(Restrictions.gt("id", afterUpdateId));
+ criteria.addOrder(Order.asc("id"));
+ return query(criteria, 0, count);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
index 2800f663fc..b42cf32db5 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
@@ -1,65 +1,9 @@
package io.onedev.server.git;
-import static io.onedev.server.util.CollectionUtils.newHashMap;
-import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;
-import static javax.servlet.http.HttpServletResponse.SC_CREATED;
-import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
-import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
-import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;
-import static javax.servlet.http.HttpServletResponse.SC_NOT_IMPLEMENTED;
-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
-import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.BooleanSupplier;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
-
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.compress.utils.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.tika.mime.MimeTypes;
-import org.glassfish.jersey.client.ClientProperties;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.hash.Hashing;
import com.google.common.hash.HashingInputStream;
-
-import static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;
import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.entitymanager.GitLfsLockManager;
@@ -73,6 +17,35 @@ import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.security.CodePullAuthorizationSource;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.facade.ProjectFacade;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.tika.mime.MimeTypes;
+import org.glassfish.jersey.client.ClientProperties;
+import org.hibernate.criterion.Restrictions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.client.*;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.StreamingOutput;
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BooleanSupplier;
+
+import static io.onedev.commons.bootstrap.Bootstrap.BUFFER_SIZE;
+import static io.onedev.server.util.CollectionUtils.newHashMap;
+import static javax.servlet.http.HttpServletResponse.*;
@Singleton
public class GitLfsFilter implements Filter {
@@ -319,7 +292,7 @@ public class GitLfsFilter implements Filter {
return true;
}
- });
+ }, clusterManager.getCredentialValue());
} else {
httpResponse.setStatus(SC_NOT_IMPLEMENTED);
}
@@ -334,6 +307,11 @@ public class GitLfsFilter implements Filter {
} else {
httpResponse.setContentType(CONTENT_TYPE);
if (pathInfo.endsWith("/batch")) {
+ String accessToken;
+ if (SecurityUtils.getUser() != null)
+ accessToken = SecurityUtils.getUser().getAccessToken();
+ else
+ accessToken = null;
processBatch(httpRequest, httpResponse, project.getFacade(), new BooleanSupplier() {
@Override
@@ -348,7 +326,7 @@ public class GitLfsFilter implements Filter {
return SecurityUtils.canWriteCode(project);
}
- });
+ }, accessToken);
} else if (pathInfo.endsWith("/locks")) {
if (httpRequest.getMethod().equals("POST")) {
if (SecurityUtils.canWriteCode(project)) {
@@ -513,7 +491,8 @@ public class GitLfsFilter implements Filter {
}
private void processBatch(HttpServletRequest httpRequest, HttpServletResponse httpResponse,
- ProjectFacade project, BooleanSupplier readCheck, BooleanSupplier writeCheck) {
+ ProjectFacade project, BooleanSupplier readCheck,
+ BooleanSupplier writeCheck, @Nullable String accessToken) {
JsonNode batchRequestNode;
try (InputStream is = httpRequest.getInputStream()) {
batchRequestNode = objectMapper.readTree(is);
@@ -567,7 +546,7 @@ public class GitLfsFilter implements Filter {
String objectId = objectNode.get("oid").asText();
long objectSize = objectNode.get("size").asLong();
objectsResponse.add(getObjectResponse(
- httpRequest, project, upload, objectId, objectSize));
+ httpRequest, project, upload, objectId, objectSize, accessToken));
}
Map<String, Object> batchResponse = new HashMap<>();
@@ -604,19 +583,21 @@ public class GitLfsFilter implements Filter {
"name", lock.getOwner().getDisplayName()));
}
- private Map<Object, Object> getActionResponse(HttpServletRequest request, ProjectFacade project, String objectId) {
+ private Map<Object, Object> getActionResponse(HttpServletRequest request, ProjectFacade project,
+ String objectId, @Nullable String accessToken) {
Map<Object, Object> actionResponse = newHashMap(
"href", getObjectUrl(request, project.getPath(), objectId));
- User user = SecurityUtils.getUser();
- if (user != null)
+ if (accessToken != null) {
actionResponse.put(
"header", newHashMap(
- "Authorization", KubernetesHelper.BEARER + " " + user.getAccessToken()));
+ "Authorization", KubernetesHelper.BEARER + " " + accessToken));
+ }
return actionResponse;
}
- private Map<String, Object> getObjectResponse(HttpServletRequest request, ProjectFacade project, boolean upload,
- String objectId, long objectSize) {
+ private Map<String, Object> getObjectResponse(HttpServletRequest request, ProjectFacade project,
+ boolean upload, String objectId, long objectSize,
+ @Nullable String accessToken) {
Map<String, Object> objectResponse = new HashMap<>();
objectResponse.put("oid", objectId);
objectResponse.put("size", objectSize);
@@ -629,12 +610,12 @@ public class GitLfsFilter implements Filter {
if (!lfsObject.exists()) {
objectResponse.put(
"actions", newHashMap(
- "upload", getActionResponse(request, project, objectId)));
+ "upload", getActionResponse(request, project, objectId, accessToken)));
}
} else if (lfsObject.exists()) {
objectResponse.put(
"actions", newHashMap(
- "download", getActionResponse(request, project, objectId)));
+ "download", getActionResponse(request, project, objectId, accessToken)));
} else {
objectResponse.put("error", newHashMap(
"code", SC_NOT_FOUND,
diff --git a/server-core/src/main/java/io/onedev/server/git/command/CloneCommand.java b/server-core/src/main/java/io/onedev/server/git/command/CloneCommand.java
index 6898859375..252256ec27 100644
--- a/server-core/src/main/java/io/onedev/server/git/command/CloneCommand.java
+++ b/server-core/src/main/java/io/onedev/server/git/command/CloneCommand.java
@@ -1,112 +1,112 @@
-package io.onedev.server.git.command;
-
-import java.io.File;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
-import io.onedev.server.git.CommandUtils;
-
-public class CloneCommand {
-
- private static final Logger logger = LoggerFactory.getLogger(CloneCommand.class);
-
- private final File workingDir;
-
- private final String from;
-
- private boolean bare;
-
- private boolean shared;
-
- private boolean mirror;
-
- private boolean noCheckout;
-
- private boolean noLfs;
-
- private String branch;
-
- public CloneCommand(File workingDir, String from) {
- this.workingDir = workingDir;
- this.from = from;
- }
-
- public CloneCommand bare(boolean bare) {
- this.bare = bare;
- return this;
- }
-
- public CloneCommand mirror(boolean mirror) {
- this.mirror = mirror;
- return this;
- }
-
- public CloneCommand shared(boolean shared) {
- this.shared = shared;
- return this;
- }
-
- public CloneCommand noCheckout(boolean noCheckout) {
- this.noCheckout = noCheckout;
- return this;
- }
-
- public CloneCommand noLfs(boolean noLfs) {
- this.noLfs = noLfs;
- return this;
- }
-
- public CloneCommand branch(String branch) {
- this.branch = branch;
- return this;
- }
-
- protected Commandline newGit() {
- return CommandUtils.newGit();
- }
-
- public void run() {
- Commandline git = newGit().workingDir(workingDir).addArgs("clone");
- if (bare)
- git.addArgs("--bare");
- if (mirror)
- git.addArgs("--mirror");
- if (shared)
- git.addArgs("--shared");
- if (noCheckout)
- git.addArgs("--no-checkout");
- if (branch != null)
- git.addArgs("-b", branch);
-
- if (noLfs)
- git.environments().put("GIT_LFS_SKIP_SMUDGE", "1");
-
- git.addArgs(from);
- git.addArgs(".");
-
- git.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.trace(line);
- }
-
- }, new LineConsumer(){
-
- @Override
- public void consume(String line) {
- if (line.startsWith("Cloning into ") || line.equals("done."))
- logger.trace(line);
- else if (line.contains("You appear to have cloned an empty repository"))
- logger.warn(line);
- else
- logger.error(line);
- }
-
- }).checkReturnCode();
- }
-
-}
+package io.onedev.server.git.command;
+
+import java.io.File;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+import io.onedev.server.git.CommandUtils;
+
+public class CloneCommand {
+
+ private static final Logger logger = LoggerFactory.getLogger(CloneCommand.class);
+
+ private final File workingDir;
+
+ private final String remotUrl;
+
+ private boolean bare;
+
+ private boolean shared;
+
+ private boolean mirror;
+
+ private boolean noCheckout;
+
+ private boolean noLfs;
+
+ private String branch;
+
+ public CloneCommand(File workingDir, String remotUrl) {
+ this.workingDir = workingDir;
+ this.remotUrl = remotUrl;
+ }
+
+ public CloneCommand bare(boolean bare) {
+ this.bare = bare;
+ return this;
+ }
+
+ public CloneCommand mirror(boolean mirror) {
+ this.mirror = mirror;
+ return this;
+ }
+
+ public CloneCommand shared(boolean shared) {
+ this.shared = shared;
+ return this;
+ }
+
+ public CloneCommand noCheckout(boolean noCheckout) {
+ this.noCheckout = noCheckout;
+ return this;
+ }
+
+ public CloneCommand noLfs(boolean noLfs) {
+ this.noLfs = noLfs;
+ return this;
+ }
+
+ public CloneCommand branch(String branch) {
+ this.branch = branch;
+ return this;
+ }
+
+ protected Commandline newGit() {
+ return CommandUtils.newGit();
+ }
+
+ public void run() {
+ Commandline git = newGit().workingDir(workingDir).addArgs("clone");
+ if (bare)
+ git.addArgs("--bare");
+ if (mirror)
+ git.addArgs("--mirror");
+ if (shared)
+ git.addArgs("--shared");
+ if (noCheckout)
+ git.addArgs("--no-checkout");
+ if (branch != null)
+ git.addArgs("-b", branch);
+
+ if (noLfs)
+ git.environments().put("GIT_LFS_SKIP_SMUDGE", "1");
+
+ git.addArgs(remotUrl);
+ git.addArgs(".");
+
+ git.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.trace(line);
+ }
+
+ }, new LineConsumer(){
+
+ @Override
+ public void consume(String line) {
+ if (line.startsWith("Cloning into ") || line.equals("done."))
+ logger.trace(line);
+ else if (line.contains("You appear to have cloned an empty repository"))
+ logger.warn(line);
+ else
+ logger.error(line);
+ }
+
+ }).checkReturnCode();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/git/command/FetchCommand.java b/server-core/src/main/java/io/onedev/server/git/command/FetchCommand.java
index b22201182c..f0589191e0 100644
--- a/server-core/src/main/java/io/onedev/server/git/command/FetchCommand.java
+++ b/server-core/src/main/java/io/onedev/server/git/command/FetchCommand.java
@@ -15,7 +15,7 @@ public class FetchCommand {
private final File workingDir;
- private final String from;
+ private final String remoteUrl;
private boolean force;
@@ -23,9 +23,9 @@ public class FetchCommand {
private String[] refspec = new String[0];
- public FetchCommand(File workingDir, String from) {
+ public FetchCommand(File workingDir, String remoteUrl) {
this.workingDir = workingDir;
- this.from = from;
+ this.remoteUrl = remoteUrl;
}
public FetchCommand refspec(String... refspec) {
@@ -48,7 +48,7 @@ public class FetchCommand {
}
public void run() {
- Commandline git = newGit().workingDir(workingDir).addArgs("fetch", from);
+ Commandline git = newGit().workingDir(workingDir).addArgs("fetch", remoteUrl);
if (force)
git.addArgs("--force");
if (quiet)
diff --git a/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java b/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java
index fd61206f03..4321a7062a 100644
--- a/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java
+++ b/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java
@@ -6,6 +6,7 @@ import io.onedev.commons.loader.ManagedSerializedForm;
import io.onedev.commons.utils.*;
import io.onedev.commons.utils.command.Commandline;
import io.onedev.commons.utils.command.LineConsumer;
+import io.onedev.server.OneDev;
import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.cluster.ClusterTask;
import io.onedev.server.entitymanager.ProjectManager;
@@ -41,11 +42,10 @@ import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javax.inject.Singleton;
-import java.io.File;
-import java.io.IOException;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.stream.Collectors;
@@ -528,7 +528,8 @@ public class DefaultGitService implements GitService, Serializable {
@Sessional
@Override
- public void push(Project sourceProject, Project targetProject, String... refSpecs) {
+ public void push(Project sourceProject, String sourceRev,
+ Project targetProject, String targetRev) {
Long targetProjectId = targetProject.getId();
Long sourceProjectId = sourceProject.getId();
String targetProjectPath = targetProject.getPath();
@@ -543,21 +544,132 @@ public class DefaultGitService implements GitService, Serializable {
// Do not optimize to push to local directory when source and target are on same host, as otherwise
// environments in git pre/post receive hooks will not be set
- CommandUtils.callWithClusterCredential(new GitTask<Void>() {
+ CommandUtils.callWithClusterCredential((GitTask<Void>) git -> {
+ git.workingDir(getGitDir(sourceProjectId));
+ git.addArgs("push", "--quiet", clusterManager.getServerUrl(targetStorageServerUUID) + "/" + targetProjectPath);
+ git.addArgs(sourceRev + ":" + targetRev);
+ git.execute(newInfoLogger(), newErrorLogger()).checkReturnCode();
+ return null;
+ });
+ return null;
+ }
+
+ });
+ }
- @Override
- public Void call(Commandline git) {
- git.workingDir(getGitDir(sourceProjectId));
- git.addArgs("push", "--quiet", clusterManager.getServerUrl(targetStorageServerUUID) + "/" + targetProjectPath);
- git.addArgs(refSpecs);
- git.execute(newInfoLogger(), newErrorLogger()).checkReturnCode();
- return null;
- }
+ @Override
+ @Sessional
+ public void pushLfsObjects(Project sourceProject, String sourceRef,
+ Project targetProject, String targetRef,
+ ObjectId commitId) {
+ Long targetProjectId = targetProject.getId();
+ Long sourceProjectId = sourceProject.getId();
+ String targetProjectPath = targetProject.getPath();
+
+ runOnProjectServer(sourceProjectId, new ClusterTask<Void>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Void call() throws Exception {
+ UUID targetStorageServerUUID = projectManager.getStorageServerUUID(targetProjectId, true);
+
+ CommandUtils.callWithClusterCredential((GitTask<Void>) git -> {
+ git.workingDir(getGitDir(sourceProjectId));
+ String remoteUrl = clusterManager.getServerUrl(targetStorageServerUUID) + "/" + targetProjectPath;
+ AtomicReference<String> remoteCommitId = new AtomicReference<>(null);
+ git.addArgs("ls-remote", remoteUrl, "HEAD", targetRef);
+ git.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ String refName = line.substring(40).trim();
+ if (refName.equals("HEAD")) {
+ if (remoteCommitId.get() == null)
+ remoteCommitId.set(line.substring(0, 40));
+ } else {
+ remoteCommitId.set(line.substring(0, 40));
+ }
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.warn(line);
+ }
+
+ });
+
+ if (remoteCommitId.get() != null) {
+ git.clearArgs();
+ git.addArgs("fetch", "--quiet", remoteUrl, remoteCommitId.get());
+ git.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.debug(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.warn(line);
+ }
+
+ }).checkReturnCode();
+
+ Repository repository = projectManager.getRepository(sourceProjectId);
+ String mergeBaseId = GitUtils.getMergeBase(repository,
+ ObjectId.fromString(remoteCommitId.get()), commitId).name();
+
+ if (!mergeBaseId.equals(commitId.name())) {
+ String input = String.format("%s %s %s %s\n", sourceRef, commitId.name(),
+ targetRef, remoteCommitId.get());
+ git.clearArgs();
+ git.addArgs("lfs", "pre-push", remoteUrl, remoteUrl);
+ git.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.debug(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.warn(line);
+ }
+
+ }, new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8))).checkReturnCode();
+ }
+ } else {
+ git.clearArgs();
+ git.addArgs("lfs", "push", "--all", remoteUrl, commitId.name());
+ git.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.debug(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.warn(line);
+ }
+
+ }).checkReturnCode();
+ }
+ return null;
});
return null;
}
-
+
});
}
diff --git a/server-core/src/main/java/io/onedev/server/git/service/GitService.java b/server-core/src/main/java/io/onedev/server/git/service/GitService.java
index 93a1d1489c..4d6b11d239 100644
--- a/server-core/src/main/java/io/onedev/server/git/service/GitService.java
+++ b/server-core/src/main/java/io/onedev/server/git/service/GitService.java
@@ -1,26 +1,20 @@
package io.onedev.server.git.service;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
+import io.onedev.commons.utils.LinearRange;
+import io.onedev.server.git.*;
+import io.onedev.server.git.command.RevListOptions;
+import io.onedev.server.model.Project;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.revwalk.LastCommitsOfChildren;
import org.eclipse.jgit.revwalk.RevCommit;
-import io.onedev.commons.utils.LinearRange;
-import io.onedev.server.git.BlameBlock;
-import io.onedev.server.git.Blob;
-import io.onedev.server.git.BlobEdits;
-import io.onedev.server.git.BlobIdent;
-import io.onedev.server.git.BlobIdentFilter;
-import io.onedev.server.git.command.RevListOptions;
-import io.onedev.server.model.Project;
+import javax.annotation.Nullable;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
public interface GitService {
@@ -57,9 +51,14 @@ public interface GitService {
void deleteTag(Project project, String tagName);
- void fetch(Project sourceProject, Project targetProject, String... refSpecs);
+ void fetch(Project targetProject, Project sourceProject, String... refSpecs);
- void push(Project targetProject, Project sourceProject, String... refSpecs);
+ void push(Project sourceProject, String sourceRev,
+ Project targetProject, String targetRev);
+
+ void pushLfsObjects(Project sourceProject, String sourceRef,
+ Project targetProject, String targetRef,
+ ObjectId commitId);
void updateRef(Project project, String refName, ObjectId newObjectId,
@Nullable ObjectId expectedOldObjectId);
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 885097841d..18ccf58fb0 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -853,7 +853,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
public void setCodeManagement(boolean codeManagement) {
this.codeManagement = codeManagement;
}
-
+
@Editable(order=300, description="Whether or not to enable issue management for the project")
public boolean isIssueManagement() {
return issueManagement;
@@ -1618,6 +1618,17 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
return MergeStrategy.CREATE_MERGE_COMMIT;
}
+
+ public boolean findPullRequestWithLFS() {
+ Project current = this;
+ do {
+ if (current.getPullRequestSetting().isWithLFS() != null)
+ return current.getPullRequestSetting().isWithLFS();
+ current = current.getParent();
+ } while (current != null);
+
+ return false;
+ }
public String getSiteLockName() {
return getSiteLockName(getId());
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.java
index 4c3e3dd4ff..5a81ecf216 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.java
@@ -14,7 +14,7 @@ import io.onedev.server.web.util.TextUtils;
public class BooleanInput {
public static List<String> getPossibleValues() {
- return Lists.newArrayList(TextUtils.describe(true), TextUtils.describe(false));
+ return Lists.newArrayList(TextUtils.getDisplayValue(true), TextUtils.getDisplayValue(false));
}
public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,
@@ -35,9 +35,9 @@ public class BooleanInput {
return false;
} else if (strings.size() == 1) {
String string = strings.iterator().next();
- if (string.equalsIgnoreCase("true") || string.equalsIgnoreCase(TextUtils.describe(true)))
+ if (string.equalsIgnoreCase("true") || string.equalsIgnoreCase(TextUtils.getDisplayValue(true)))
return true;
- else if (string.equalsIgnoreCase("false") || string.equalsIgnoreCase(TextUtils.describe(false)))
+ else if (string.equalsIgnoreCase("false") || string.equalsIgnoreCase(TextUtils.getDisplayValue(false)))
return false;
else
throw new ValidationException("Invalid boolean value");
@@ -48,9 +48,9 @@ public class BooleanInput {
public static List<String> convertToStrings(Object value) {
if (value instanceof Boolean)
- return Lists.newArrayList(TextUtils.describe((Boolean)value));
+ return Lists.newArrayList(TextUtils.getDisplayValue((Boolean)value));
else
- return Lists.newArrayList(TextUtils.describe(false));
+ return Lists.newArrayList(TextUtils.getDisplayValue(false));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java
index c8e2fbe1fb..f4baea5844 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java
@@ -1,5 +1,6 @@
package io.onedev.server.model.support.pullrequest;
+import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.server.web.editable.annotation.Editable;
import java.io.Serializable;
@@ -14,6 +15,8 @@ public class ProjectPullRequestSetting implements Serializable {
private List<NamedPullRequestQuery> namedQueries;
+ private Boolean withLFS;
+
private MergeStrategy defaultMergeStrategy;
@Nullable
@@ -25,7 +28,26 @@ public class ProjectPullRequestSetting implements Serializable {
this.namedQueries = namedQueries;
}
- @Editable(placeholder = "Inherit from parent", rootPlaceholder = "Create merge commit",
+ @Editable(order=100, name="Fetch LFS Objects", placeholder = "Inherit from parent", rootPlaceholder = "No",
+ descriptionProvider = "getLfsDescription")
+ public Boolean isWithLFS() {
+ return withLFS;
+ }
+
+ public void setWithLFS(Boolean withLFS) {
+ this.withLFS = withLFS;
+ }
+
+ private static String getLfsDescription() {
+ if (!Bootstrap.isInDocker()) {
+ return "Whether or not to fetch LFS objects if pull request is opened from a different project. " +
+ "If this option is enabled, git lfs command needs to be installed on OneDev server";
+ } else {
+ return "Whether or not to fetch LFS objects if pull request is opened from a different project.";
+ }
+ }
+
+ @Editable(order=200, placeholder = "Inherit from parent", rootPlaceholder = "Create merge commit",
description = "Specify default merge strategy of pull requests submitted to this project")
public MergeStrategy getDefaultMergeStrategy() {
return defaultMergeStrategy;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java
index b687412b8e..70ebe5152e 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java
@@ -33,7 +33,7 @@ public class BooleanEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
if (model.getObject() != null) {
- return new Label(id, TextUtils.describe(model.getObject()));
+ return new Label(id, TextUtils.getDisplayValue(model.getObject()));
} else {
return new EmptyValueLabel(id) {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.html
index 82465df676..a62a3bcf51 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <select wicket:id="input" class="form-control"></select>
+ <input wicket:id="input" type="hidden" class="form-control"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java
index b8d444f8e8..91a3437445 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java
@@ -1,21 +1,23 @@
package io.onedev.server.web.editable.bool;
+import io.onedev.server.web.component.stringchoice.StringSingleChoice;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.util.TextUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.markup.html.form.DropDownChoice;
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;
-import com.google.common.collect.Lists;
-
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.editable.PropertyEditor;
+import java.util.LinkedHashMap;
+import java.util.Map;
@SuppressWarnings("serial")
public class NullableBooleanPropertyEditor extends PropertyEditor<Boolean> {
- private DropDownChoice<String> input;
+ private StringSingleChoice input;
public NullableBooleanPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<Boolean> propertyModel) {
super(id, propertyDescriptor, propertyModel);
@@ -25,38 +27,52 @@ public class NullableBooleanPropertyEditor extends PropertyEditor<Boolean> {
protected void onInitialize() {
super.onInitialize();
- String stringValue;
- if (getModelObject() != null) {
- if (getModelObject())
- stringValue = "yes";
- else
- stringValue = "no";
- } else {
- stringValue = null;
- }
- input = new DropDownChoice<String>("input", Model.of(stringValue), Lists.newArrayList("yes", "no"));
+ String selection;
+ if (getModelObject() != null)
+ selection = TextUtils.getDisplayValue(getModelObject());
+ else
+ selection = null;
+
+ input = new StringSingleChoice("input", Model.of(selection), new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ Map<String, String> choices = new LinkedHashMap<>();
+ choices.put(TextUtils.getDisplayValue(true), TextUtils.getDisplayValue(true));
+ choices.put(TextUtils.getDisplayValue(false), TextUtils.getDisplayValue(false));
+ return choices;
+ }
+
+ }, false) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().configurePlaceholder(descriptor);
+ getSettings().setAllowClear(!descriptor.isPropertyRequired());
+ }
+
+ };
input.setLabel(Model.of(getDescriptor().getDisplayName()));
-
- input.setNullValid(true);
-
- add(input);
- input.add(new AjaxFormComponentUpdatingBehavior("change"){
+ input.add(new AjaxFormComponentUpdatingBehavior("change") {
@Override
protected void onUpdate(AjaxRequestTarget target) {
onPropertyUpdating(target);
}
-
+
});
+
+ add(input);
}
@Override
protected Boolean convertInputToValue() throws ConversionException {
String stringValue = input.getConvertedInput();
- if ("yes".equals(stringValue))
+ if (TextUtils.getDisplayValue(true).equals(stringValue))
return true;
- else if ("no".equals(stringValue))
+ else if (TextUtils.getDisplayValue(false).equals(stringValue))
return false;
else
return null;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.java
index 22d9cf13f4..59d2348f09 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.java
@@ -1,289 +1,289 @@
-package io.onedev.server.web.editable.buildspec.job.jobdependency;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-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.event.IEvent;
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.markup.repeater.data.ListDataProvider;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.util.convert.ConversionException;
-
-import io.onedev.server.buildspec.BuildSpec;
-import io.onedev.server.buildspec.BuildSpecAware;
-import io.onedev.server.buildspec.job.Job;
-import io.onedev.server.buildspec.job.JobAware;
-import io.onedev.server.buildspec.job.JobDependency;
-import io.onedev.server.buildspec.param.spec.ParamSpec;
-import io.onedev.server.web.behavior.NoRecordsBehavior;
-import io.onedev.server.web.behavior.sortable.SortBehavior;
-import io.onedev.server.web.behavior.sortable.SortPosition;
-import io.onedev.server.web.component.modal.ModalLink;
-import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.svg.SpriteImage;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.web.editable.PropertyUpdating;
-import io.onedev.server.web.util.TextUtils;
-
-@SuppressWarnings("serial")
-class JobDependencyListEditPanel extends PropertyEditor<List<Serializable>> {
-
- private final List<JobDependency> dependencies;
-
- public JobDependencyListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {
- super(id, propertyDescriptor, model);
-
- dependencies = new ArrayList<>();
- for (Serializable each: model.getObject()) {
- dependencies.add((JobDependency) each);
- }
- }
-
- private BuildSpec getBuildSpec() {
- BuildSpecAware buildSpecAware = findParent(BuildSpecAware.class);
- if (buildSpecAware != null)
- return buildSpecAware.getBuildSpec();
- else
- return null;
- }
-
- private Job getJob() {
- JobAware jobAware = findParent(JobAware.class);
- if (jobAware != null)
- return jobAware.getJob();
- else
- return null;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new ModalLink("addNew") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return new JobDependencyEditPanel(id, dependencies, -1) {
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected void onSave(AjaxRequestTarget target) {
- markFormDirty(target);
- modal.close();
- onPropertyUpdating(target);
- target.add(JobDependencyListEditPanel.this);
- }
-
- @Override
- public BuildSpec getBuildSpec() {
- return JobDependencyListEditPanel.this.getBuildSpec();
- }
-
- @Override
- public Job getJob() {
- return JobDependencyListEditPanel.this.getJob();
- }
-
- @Override
- public List<ParamSpec> getParamSpecs() {
- return getJob()!=null? getJob().getParamSpecs(): null;
- }
-
- };
- }
-
- });
-
- List<IColumn<JobDependency, Void>> columns = new ArrayList<>();
-
- columns.add(new AbstractColumn<JobDependency, Void>(Model.of("")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
- cellItem.add(new SpriteImage(componentId, "grip") {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.setName("svg");
- tag.put("class", "icon drag-indicator");
- }
-
- });
- }
-
- @Override
- public String getCssClass() {
- return "minimum actions";
- }
-
- });
-
- columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Job")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getJobName()));
- }
- });
-
- columns.add(new AbstractColumn<JobDependency, Void>(Model.of("#Params")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getJobParams().size()));
- }
-
- });
-
- columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Require Successful")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
- JobDependency dependency = rowModel.getObject();
- cellItem.add(new Label(componentId, TextUtils.describe(dependency.isRequireSuccessful())));
- }
- });
-
- columns.add(new AbstractColumn<JobDependency, Void>(Model.of("")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
- Fragment fragment = new Fragment(componentId, "actionColumnFrag", JobDependencyListEditPanel.this);
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return new JobDependencyEditPanel(id, dependencies, cellItem.findParent(Item.class).getIndex()) {
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected void onSave(AjaxRequestTarget target) {
- markFormDirty(target);
- modal.close();
- onPropertyUpdating(target);
- target.add(JobDependencyListEditPanel.this);
- }
-
- @Override
- public BuildSpec getBuildSpec() {
- return JobDependencyListEditPanel.this.getBuildSpec();
- }
-
- @Override
- public Job getJob() {
- return JobDependencyListEditPanel.this.getJob();
- }
-
- @Override
- public List<ParamSpec> getParamSpecs() {
- return getJob()!=null? getJob().getParamSpecs(): null;
- }
-
- };
- }
-
- });
- fragment.add(new AjaxLink<Void>("delete") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- markFormDirty(target);
- dependencies.remove(rowModel.getObject());
- onPropertyUpdating(target);
- target.add(JobDependencyListEditPanel.this);
- }
-
- });
- cellItem.add(fragment);
- }
-
- @Override
- public String getCssClass() {
- return "actions minimum";
- }
-
- });
-
- IDataProvider<JobDependency> dataProvider = new ListDataProvider<JobDependency>() {
-
- @Override
- protected List<JobDependency> getData() {
- return dependencies;
- }
-
- };
-
- DataTable<JobDependency, Void> dataTable;
- add(dataTable = new DataTable<JobDependency, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE));
- dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
- dataTable.add(new NoRecordsBehavior());
- dataTable.add(new SortBehavior() {
-
- @Override
- protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
- int fromIndex = from.getItemIndex();
- int toIndex = to.getItemIndex();
- if (fromIndex < toIndex) {
- for (int i=0; i<toIndex-fromIndex; i++)
- Collections.swap(dependencies, fromIndex+i, fromIndex+i+1);
- } else {
- for (int i=0; i<fromIndex-toIndex; i++)
- Collections.swap(dependencies, fromIndex-i, fromIndex-i-1);
- }
- onPropertyUpdating(target);
- target.add(JobDependencyListEditPanel.this);
- }
-
- }.sortable("tbody"));
- }
-
- @Override
- public void onEvent(IEvent<?> event) {
- super.onEvent(event);
-
- if (event.getPayload() instanceof PropertyUpdating) {
- event.stop();
- onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());
- }
- }
-
- @Override
- protected List<Serializable> convertInputToValue() throws ConversionException {
- List<Serializable> value = new ArrayList<>();
- for (JobDependency each: dependencies)
- value.add(each);
- return value;
- }
-
- @Override
- public boolean needExplicitSubmit() {
- return true;
- }
-
-}
+package io.onedev.server.web.editable.buildspec.job.jobdependency;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+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.event.IEvent;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.ConversionException;
+
+import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.BuildSpecAware;
+import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.job.JobAware;
+import io.onedev.server.buildspec.job.JobDependency;
+import io.onedev.server.buildspec.param.spec.ParamSpec;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.behavior.sortable.SortBehavior;
+import io.onedev.server.web.behavior.sortable.SortPosition;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.svg.SpriteImage;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyUpdating;
+import io.onedev.server.web.util.TextUtils;
+
+@SuppressWarnings("serial")
+class JobDependencyListEditPanel extends PropertyEditor<List<Serializable>> {
+
+ private final List<JobDependency> dependencies;
+
+ public JobDependencyListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {
+ super(id, propertyDescriptor, model);
+
+ dependencies = new ArrayList<>();
+ for (Serializable each: model.getObject()) {
+ dependencies.add((JobDependency) each);
+ }
+ }
+
+ private BuildSpec getBuildSpec() {
+ BuildSpecAware buildSpecAware = findParent(BuildSpecAware.class);
+ if (buildSpecAware != null)
+ return buildSpecAware.getBuildSpec();
+ else
+ return null;
+ }
+
+ private Job getJob() {
+ JobAware jobAware = findParent(JobAware.class);
+ if (jobAware != null)
+ return jobAware.getJob();
+ else
+ return null;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new ModalLink("addNew") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new JobDependencyEditPanel(id, dependencies, -1) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ markFormDirty(target);
+ modal.close();
+ onPropertyUpdating(target);
+ target.add(JobDependencyListEditPanel.this);
+ }
+
+ @Override
+ public BuildSpec getBuildSpec() {
+ return JobDependencyListEditPanel.this.getBuildSpec();
+ }
+
+ @Override
+ public Job getJob() {
+ return JobDependencyListEditPanel.this.getJob();
+ }
+
+ @Override
+ public List<ParamSpec> getParamSpecs() {
+ return getJob()!=null? getJob().getParamSpecs(): null;
+ }
+
+ };
+ }
+
+ });
+
+ List<IColumn<JobDependency, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
+ cellItem.add(new SpriteImage(componentId, "grip") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("svg");
+ tag.put("class", "icon drag-indicator");
+ }
+
+ });
+ }
+
+ @Override
+ public String getCssClass() {
+ return "minimum actions";
+ }
+
+ });
+
+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Job")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getJobName()));
+ }
+ });
+
+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("#Params")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getJobParams().size()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Require Successful")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
+ JobDependency dependency = rowModel.getObject();
+ cellItem.add(new Label(componentId, TextUtils.getDisplayValue(dependency.isRequireSuccessful())));
+ }
+ });
+
+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", JobDependencyListEditPanel.this);
+ fragment.add(new ModalLink("edit") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new JobDependencyEditPanel(id, dependencies, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ markFormDirty(target);
+ modal.close();
+ onPropertyUpdating(target);
+ target.add(JobDependencyListEditPanel.this);
+ }
+
+ @Override
+ public BuildSpec getBuildSpec() {
+ return JobDependencyListEditPanel.this.getBuildSpec();
+ }
+
+ @Override
+ public Job getJob() {
+ return JobDependencyListEditPanel.this.getJob();
+ }
+
+ @Override
+ public List<ParamSpec> getParamSpecs() {
+ return getJob()!=null? getJob().getParamSpecs(): null;
+ }
+
+ };
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ markFormDirty(target);
+ dependencies.remove(rowModel.getObject());
+ onPropertyUpdating(target);
+ target.add(JobDependencyListEditPanel.this);
+ }
+
+ });
+ cellItem.add(fragment);
+ }
+
+ @Override
+ public String getCssClass() {
+ return "actions minimum";
+ }
+
+ });
+
+ IDataProvider<JobDependency> dataProvider = new ListDataProvider<JobDependency>() {
+
+ @Override
+ protected List<JobDependency> getData() {
+ return dependencies;
+ }
+
+ };
+
+ DataTable<JobDependency, Void> dataTable;
+ add(dataTable = new DataTable<JobDependency, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE));
+ dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.add(new NoRecordsBehavior());
+ dataTable.add(new SortBehavior() {
+
+ @Override
+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ int fromIndex = from.getItemIndex();
+ int toIndex = to.getItemIndex();
+ if (fromIndex < toIndex) {
+ for (int i=0; i<toIndex-fromIndex; i++)
+ Collections.swap(dependencies, fromIndex+i, fromIndex+i+1);
+ } else {
+ for (int i=0; i<fromIndex-toIndex; i++)
+ Collections.swap(dependencies, fromIndex-i, fromIndex-i-1);
+ }
+ onPropertyUpdating(target);
+ target.add(JobDependencyListEditPanel.this);
+ }
+
+ }.sortable("tbody"));
+ }
+
+ @Override
+ public void onEvent(IEvent<?> event) {
+ super.onEvent(event);
+
+ if (event.getPayload() instanceof PropertyUpdating) {
+ event.stop();
+ onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());
+ }
+ }
+
+ @Override
+ protected List<Serializable> convertInputToValue() throws ConversionException {
+ List<Serializable> value = new ArrayList<>();
+ for (JobDependency each: dependencies)
+ value.add(each);
+ return value;
+ }
+
+ @Override
+ public boolean needExplicitSubmit() {
+ return true;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.java
index 5d3521f666..70b597f5cd 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.java
@@ -1,145 +1,145 @@
-package io.onedev.server.web.editable.buildspec.job.jobdependency;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-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.behavior.AttributeAppender;
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.markup.repeater.data.ListDataProvider;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-
-import io.onedev.server.buildspec.job.JobDependency;
-import io.onedev.server.web.behavior.NoRecordsBehavior;
-import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
-import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.util.TextUtils;
-
-@SuppressWarnings("serial")
-class JobDependencyListViewPanel extends Panel {
-
- private final List<JobDependency> dependencies = new ArrayList<>();
-
- public JobDependencyListViewPanel(String id, List<Serializable> elements) {
- super(id);
-
- for (Serializable each: elements)
- dependencies.add((JobDependency) each);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- List<IColumn<JobDependency, Void>> columns = new ArrayList<>();
-
- columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Job")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getJobName()));
- }
-
- });
-
- columns.add(new AbstractColumn<JobDependency, Void>(Model.of("#Params")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getJobParams().size()));
- }
-
- });
-
- columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Require Successful")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
- JobDependency dependency = rowModel.getObject();
- cellItem.add(new Label(componentId, TextUtils.describe(dependency.isRequireSuccessful())));
- }
-
- });
-
- columns.add(new AbstractColumn<JobDependency, Void>(Model.of("")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
- int dependencyIndex = cellItem.findParent(Item.class).getIndex();
- Fragment fragment = new Fragment(componentId, "showDetailFrag", JobDependencyListViewPanel.this);
- fragment.add(new AjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
-
- @Override
- protected Component newTitle(String componentId) {
- return new Label(componentId, "Job Dependency");
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "job-dependency"));
- }
-
- @Override
- protected Component newBody(String id) {
- return BeanContext.view(id, dependencies.get(dependencyIndex));
- }
-
- };
- }
-
- });
-
- cellItem.add(fragment);
- }
-
- @Override
- public String getCssClass() {
- return "ellipsis text-right";
- }
-
- });
-
- IDataProvider<JobDependency> dataProvider = new ListDataProvider<JobDependency>() {
-
- @Override
- protected List<JobDependency> getData() {
- return dependencies;
- }
-
- };
-
- add(new DataTable<JobDependency, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new NoRecordsBehavior());
- addTopToolbar(new HeadersToolbar<Void>(this, null));
- addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
- }
-
- });
- }
-
-
-}
+package io.onedev.server.web.editable.buildspec.job.jobdependency;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+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.behavior.AttributeAppender;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+import io.onedev.server.buildspec.job.JobDependency;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.util.TextUtils;
+
+@SuppressWarnings("serial")
+class JobDependencyListViewPanel extends Panel {
+
+ private final List<JobDependency> dependencies = new ArrayList<>();
+
+ public JobDependencyListViewPanel(String id, List<Serializable> elements) {
+ super(id);
+
+ for (Serializable each: elements)
+ dependencies.add((JobDependency) each);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ List<IColumn<JobDependency, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Job")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getJobName()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("#Params")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getJobParams().size()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Require Successful")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
+ JobDependency dependency = rowModel.getObject();
+ cellItem.add(new Label(componentId, TextUtils.getDisplayValue(dependency.isRequireSuccessful())));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
+ int dependencyIndex = cellItem.findParent(Item.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "showDetailFrag", JobDependencyListViewPanel.this);
+ fragment.add(new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+
+ @Override
+ protected Component newTitle(String componentId) {
+ return new Label(componentId, "Job Dependency");
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "job-dependency"));
+ }
+
+ @Override
+ protected Component newBody(String id) {
+ return BeanContext.view(id, dependencies.get(dependencyIndex));
+ }
+
+ };
+ }
+
+ });
+
+ cellItem.add(fragment);
+ }
+
+ @Override
+ public String getCssClass() {
+ return "ellipsis text-right";
+ }
+
+ });
+
+ IDataProvider<JobDependency> dataProvider = new ListDataProvider<JobDependency>() {
+
+ @Override
+ protected List<JobDependency> getData() {
+ return dependencies;
+ }
+
+ };
+
+ add(new DataTable<JobDependency, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new NoRecordsBehavior());
+ addTopToolbar(new HeadersToolbar<Void>(this, null));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
+ }
+
+ });
+ }
+
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java
index 1278449aeb..d086e764f5 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java
@@ -5,6 +5,7 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
+import io.onedev.server.web.util.TextUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -30,10 +31,6 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {
enumClass = (Class<Enum>) propertyDescriptor.getPropertyGetter().getReturnType();
}
- private String getDisplayValue(String choice) {
- return StringUtils.capitalize(choice.replace('_', ' ').toLowerCase());
- }
-
@Override
protected void onInitialize() {
super.onInitialize();
@@ -51,7 +48,7 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {
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()));
+ choices.put(value.name(), TextUtils.getDisplayValue(value));
}
return choices;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java
index 3b2cf6e1c6..0a277560d1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java
@@ -264,7 +264,7 @@ public class MethodDetailPage extends ApiHelpPage {
item.add(new Label("description", api.description()).setEscapeModelStrings(false));
else
item.add(new Label("description", StringUtils.capitalize(WordUtils.uncamel(queryParam.value()).toLowerCase())));
- item.add(new Label("required", TextUtils.describe(ParamCheckFilter.isRequired(param))));
+ item.add(new Label("required", TextUtils.getDisplayValue(ParamCheckFilter.isRequired(param))));
Serializable exampleValue = new ExampleProvider(getResourceMethod().getDeclaringClass(), api).getExample();
if (exampleValue == null)
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/pullrequest/PullRequestSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/pullrequest/PullRequestSettingPage.java
index 8aae129787..0ef89a145e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/pullrequest/PullRequestSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/pullrequest/PullRequestSettingPage.java
@@ -3,7 +3,6 @@ package io.onedev.server.web.page.project.setting.code.pullrequest;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.CodeAnalysisSetting;
import io.onedev.server.model.support.pullrequest.ProjectPullRequestSetting;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.editable.BeanContext;
@@ -33,7 +32,6 @@ public class PullRequestSettingPage extends ProjectSettingPage {
@Override
protected void onSubmit() {
super.onSubmit();
-
getProject().setPullRequestSetting(bean);
OneDev.getInstance(ProjectManager.class).save(getProject());
setResponsePage(PullRequestSettingPage.class, PullRequestSettingPage.paramsOf(getProject()));
diff --git a/server-core/src/main/java/io/onedev/server/web/util/TextUtils.java b/server-core/src/main/java/io/onedev/server/web/util/TextUtils.java
index e14bf8d7f6..3cd1925e9c 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/TextUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/TextUtils.java
@@ -1,9 +1,15 @@
package io.onedev.server.web.util;
+import org.apache.commons.lang3.StringUtils;
+
public class TextUtils {
- public static String describe(boolean value) {
+ public static String getDisplayValue(boolean value) {
return value? "Yes": "No";
}
+ public static String getDisplayValue(Enum<?> value) {
+ return StringUtils.capitalize(value.name().replace('_', ' ').toLowerCase());
+ }
+
}