Skip to content

The Unified and Autonomous Development Platform

Show branch/tag/user/group usage place when deleting

Robin Shenc61916ce0273
diff --git a/core/src/main/java/io/onedev/server/cache/CommitInfoManager.java b/core/src/main/java/io/onedev/server/cache/CommitInfoManager.java
index e6efc214a0..c3a0961c5c 100644
--- a/core/src/main/java/io/onedev/server/cache/CommitInfoManager.java
+++ b/core/src/main/java/io/onedev/server/cache/CommitInfoManager.java
@@ -80,5 +80,5 @@ public interface CommitInfoManager {
Map<Day, Map<String, Integer>> getLineIncrements(Project project);
Collection<ObjectId> getFixCommits(Project project, Long issueNumber);
-
+
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java
index 8e701e12c6..6814b303e1 100644
--- a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java
+++ b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java
@@ -50,7 +50,7 @@ import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.event.BuildCommitsAware;
+import io.onedev.server.event.BuildCommitAware;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.event.build.BuildFinished;
import io.onedev.server.event.build.BuildQueueing;
@@ -409,8 +409,9 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT
@Sessional
@Listen
public void on(ProjectEvent event) {
- if (event instanceof BuildCommitsAware) {
- for (ObjectId commitId: ((BuildCommitsAware) event).getBuildCommits()) {
+ if (event instanceof BuildCommitAware) {
+ ObjectId commitId = ((BuildCommitAware) event).getBuildCommit();
+ if (!commitId.equals(ObjectId.zeroId())) {
try {
CISpec ciSpec = event.getProject().getCISpec(commitId);
if (ciSpec != null) {
diff --git a/core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
index f2bf842588..89c39d297f 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
@@ -34,6 +34,14 @@ public interface ProjectManager extends EntityManager<Project> {
*/
void save(Project project, @Nullable String oldName);
+ void onDeleteBranch(Project project, String branchName);
+
+ void deleteBranch(Project project, String branchName);
+
+ void onDeleteTag(Project project, String tagName);
+
+ void deleteTag(Project project, String tagName);
+
Repository getRepository(Project project);
Collection<ProjectFacade> getAccessibleProjects(@Nullable User user);
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
index e8982a1667..0d1166cd36 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
@@ -1,7 +1,5 @@
package io.onedev.server.entitymanager.impl;
-import java.util.Iterator;
-
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -19,6 +17,7 @@ import io.onedev.server.persistence.annotation.Sessional;
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.util.Usage;
@Singleton
public class DefaultGroupManager extends AbstractEntityManager<Group> implements GroupManager {
@@ -68,23 +67,23 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implements
@Transactional
@Override
public void delete(Group group) {
+ Usage usage = new Usage();
for (Project project: projectManager.query()) {
- for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {
- if (it.next().onDeleteGroup(group.getName()))
- it.remove();
- }
- for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {
- if (it.next().onDeleteGroup(group.getName()))
- it.remove();
- }
- project.getIssueSetting().onDeleteGroup(group.getName());
+ for (BranchProtection protection: project.getBranchProtections())
+ usage.add(protection.onDeleteGroup(group.getName()));
+ for (TagProtection protection: project.getTagProtections())
+ usage.add(protection.onDeleteGroup(group.getName()));
+ usage.add(project.getIssueSetting().onDeleteGroup(group.getName()));
+ usage.prefix("project '" + project.getName() + "': setting");
}
+
+ usage.add(settingManager.getIssueSetting().onDeleteGroup(group.getName()).prefix("administration"));
+
Authenticator authenticator = settingManager.getAuthenticator();
- if (authenticator != null) {
- authenticator.onDeleteGroup(group.getName());
- settingManager.saveAuthenticator(authenticator);
- }
- settingManager.getIssueSetting().onDeleteGroup(group.getName());
+ if (authenticator != null && authenticator.getDefaultGroupNames().contains(group.getName()))
+ usage.add("administration: authenticator");
+
+ usage.checkInUse("Group '" + group.getName() + "'");
dao.remove(group);
}
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
index fa5cae496e..eec2369413 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
@@ -13,6 +13,7 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import org.apache.wicket.util.lang.Objects;
+import org.eclipse.jgit.lib.ObjectId;
import com.google.common.base.Optional;
@@ -31,6 +32,7 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Milestone;
+import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.TransitionSpec;
@@ -205,11 +207,17 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
@Transactional
@Listen
public void on(BuildEvent event) {
- for (TransitionSpec transition: event.getBuild().getProject().getIssueSetting().getTransitionSpecs(true)) {
+ Project project = event.getBuild().getProject();
+ for (TransitionSpec transition: project.getIssueSetting().getTransitionSpecs(true)) {
if (transition.getTrigger() instanceof BuildSuccessfulTrigger) {
BuildSuccessfulTrigger trigger = (BuildSuccessfulTrigger) transition.getTrigger();
+ String branches = trigger.getBranches();
+ String tags = trigger.getTags();
+ ObjectId commitId = ObjectId.fromString(event.getBuild().getCommitHash());
if (trigger.getJobName().equals(event.getBuild().getJobName())
- && event.getBuild().getStatus() == Build.Status.SUCCESSFUL) {
+ && event.getBuild().getStatus() == Build.Status.SUCCESSFUL
+ && (branches == null || project.isCommitOnBranches(commitId, branches))
+ && (tags == null || project.isCommitOnTags(commitId, tags))) {
Long buildId = event.getBuild().getId();
/*
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 1fd4ed68a2..8217d9c75e 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -18,7 +18,10 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import org.apache.commons.io.IOUtils;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.util.ThreadContext;
import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm;
import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.lib.ConfigConstants;
@@ -32,6 +35,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.StringUtils;
@@ -41,6 +45,7 @@ import io.onedev.server.ci.JobDependency;
import io.onedev.server.ci.job.param.JobParam;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserAuthorizationManager;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.event.system.SystemStarted;
@@ -55,6 +60,9 @@ import io.onedev.server.model.UserAuthorization;
import io.onedev.server.model.support.BranchProtection;
import io.onedev.server.model.support.FileProtection;
import io.onedev.server.model.support.TagProtection;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
+import io.onedev.server.persistence.SessionManager;
+import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
@@ -62,10 +70,12 @@ import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPrivilege;
import io.onedev.server.util.MatrixRunner;
+import io.onedev.server.util.Usage;
import io.onedev.server.util.facade.GroupAuthorizationFacade;
import io.onedev.server.util.facade.MembershipFacade;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.facade.UserAuthorizationFacade;
+import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.reviewrequirement.ReviewRequirement;
import io.onedev.server.web.avatar.AvatarManager;
@@ -84,6 +94,14 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
private final AvatarManager avatarManager;
+ private final SettingManager settingManager;
+
+ private final SessionManager sessionManager;
+
+ private final TransactionManager transactionManager;
+
+ private final ListenerRegistry listenerRegistry;
+
private final String gitReceiveHook;
private final Map<Long, Repository> repositoryCache = new ConcurrentHashMap<>();
@@ -91,7 +109,9 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
@Inject
public DefaultProjectManager(Dao dao, CommitInfoManager commitInfoManager,
UserAuthorizationManager userAuthorizationManager, BuildManager buildManager,
- CacheManager cacheManager, AvatarManager avatarManager) {
+ CacheManager cacheManager, AvatarManager avatarManager, SettingManager settingManager,
+ TransactionManager transactionManager, SessionManager sessionManager,
+ ListenerRegistry listenerRegistry) {
super(dao);
this.commitInfoManager = commitInfoManager;
@@ -99,6 +119,10 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
this.buildManager = buildManager;
this.cacheManager = cacheManager;
this.avatarManager = avatarManager;
+ this.settingManager = settingManager;
+ this.transactionManager = transactionManager;
+ this.sessionManager = sessionManager;
+ this.listenerRegistry = listenerRegistry;
try (InputStream is = getClass().getClassLoader().getResourceAsStream("git-receive-hook")) {
Preconditions.checkNotNull(is);
@@ -147,12 +171,24 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
authorization.setUser(SecurityUtils.getUser());
userAuthorizationManager.save(authorization);
checkSanity(project);
+ }
+
+ if (oldName != null && !oldName.equals(project.getName())) {
+ for (JobExecutor jobExecutor: settingManager.getJobExecutors())
+ jobExecutor.onProjectRenamed(oldName, project.getName());
}
+
}
@Transactional
@Override
public void delete(Project project) {
+ Usage usage = new Usage();
+ for (JobExecutor jobExecutor: settingManager.getJobExecutors())
+ usage.add(jobExecutor.getProjectUsage(project.getName()).prefix("administration"));
+
+ usage.checkInUse("Project '" + project.getName() + "'");
+
for (Build build: project.getBuilds())
buildManager.delete(build);
@@ -161,7 +197,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
query.executeUpdate();
dao.remove(project);
-
+
synchronized (repositoryCache) {
Repository repository = repositoryCache.remove(project.getId());
if (repository != null)
@@ -273,27 +309,121 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
}
@Transactional
- @Listen
- public void on(RefUpdated event) {
- if (event.getNewCommitId().equals(ObjectId.zeroId())) {
- Project project = event.getProject();
- String branch = GitUtils.ref2branch(event.getRefName());
- if (branch != null) {
- for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {
- if (it.next().onBranchDeleted(branch))
- it.remove();
- }
- }
- String tag = GitUtils.ref2tag(event.getRefName());
- if (tag != null) {
- for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {
- if (it.next().onTagDeleted(tag))
- it.remove();
- }
+ @Override
+ public void onDeleteBranch(Project project, String branchName) {
+ Usage usage = new Usage();
+
+ for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {
+ BranchProtection protection = it.next();
+ PatternSet patternSet = PatternSet.fromString(protection.getBranches());
+ patternSet.getIncludes().remove(branchName);
+ patternSet.getExcludes().remove(branchName);
+ protection.setBranches(patternSet.toString());
+ if (protection.getBranches().length() == 0)
+ it.remove();
+ }
+
+ usage.add(project.getIssueSetting().onDeleteBranch(branchName));
+
+ usage.prefix("project setting").checkInUse("Branch '" + branchName + "'");
+ }
+
+ @Transactional
+ @Override
+ public void deleteBranch(Project project, String branchName) {
+ onDeleteBranch(project, branchName);
+
+ String refName = GitUtils.branch2ref(branchName);
+ ObjectId commitId = project.getObjectId(refName, true);
+ try {
+ project.git().branchDelete().setForce(true).setBranchNames(branchName).call();
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ }
+
+ Subject subject = SecurityUtils.getSubject();
+ Long projectId = project.getId();
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ sessionManager.runAsync(new Runnable() {
+
+ @Override
+ public void run() {
+ ThreadContext.bind(subject);
+ try {
+ Project project = load(projectId);
+ listenerRegistry.post(new RefUpdated(project, refName, commitId, ObjectId.zeroId()));
+ } finally {
+ ThreadContext.unbindSubject();
+ }
+ }
+
+ });
}
+
+ });
+
+ }
+
+ @Transactional
+ @Override
+ public void onDeleteTag(Project project, String tagName) {
+ Usage usage = new Usage();
+ for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {
+ TagProtection protection = it.next();
+ PatternSet patternSet = PatternSet.fromString(protection.getTags());
+ patternSet.getIncludes().remove(tagName);
+ patternSet.getExcludes().remove(tagName);
+ protection.setTags(patternSet.toString());
+ if (protection.getTags().length() == 0)
+ it.remove();
}
+
+ usage.add(project.getIssueSetting().onDeleteTag(tagName));
+
+ usage.prefix("project setting").checkInUse("Tag '" + tagName + "'");
}
+
+ @Transactional
+ @Override
+ public void deleteTag(Project project, String tagName) {
+ onDeleteTag(project, tagName);
+
+ String refName = GitUtils.tag2ref(tagName);
+ ObjectId commitId = project.getRevCommit(refName, true).getId();
+ try {
+ project.git().tagDelete().setTags(tagName).call();
+ } catch (GitAPIException e) {
+ throw new RuntimeException(e);
+ }
+
+ Subject subject = SecurityUtils.getSubject();
+ Long projectId = project.getId();
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ sessionManager.runAsync(new Runnable() {
+ @Override
+ public void run() {
+ ThreadContext.bind(subject);
+ try {
+ Project project = load(projectId);
+ listenerRegistry.post(new RefUpdated(project, refName, commitId, ObjectId.zeroId()));
+ } finally {
+ ThreadContext.unbindSubject();
+ }
+ }
+
+ });
+ }
+
+ });
+ }
+
@Override
public Collection<ProjectFacade> getAccessibleProjects(User user) {
Collection<ProjectFacade> projects = new HashSet<>();
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index f1440bd7d7..5c3c87f488 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -65,6 +65,7 @@ import io.onedev.server.ci.job.JobScheduler;
import io.onedev.server.ci.job.param.JobParam;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.BuildRequirementManager;
+import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.PullRequestReviewManager;
@@ -142,6 +143,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
private final PullRequestUpdateManager pullRequestUpdateManager;
+ private final ProjectManager projectManager;
+
private final UserManager userManager;
private final SessionManager sessionManager;
@@ -169,7 +172,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
ListenerRegistry listenerRegistry, SessionManager sessionManager,
PullRequestChangeManager pullRequestChangeManager, BuildManager buildManager,
BuildRequirementManager buildRequirementManager, TransactionManager transactionManager,
- JobScheduler jobScheduler) {
+ JobScheduler jobScheduler, ProjectManager projectManager) {
super(dao);
this.pullRequestUpdateManager = pullRequestUpdateManager;
@@ -183,6 +186,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
this.pullRequestChangeManager = pullRequestChangeManager;
this.buildRequirementManager = buildRequirementManager;
this.jobScheduler = jobScheduler;
+ this.projectManager = projectManager;
}
@Transactional
@@ -229,8 +233,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
Preconditions.checkState(!request.isOpen() && request.getSourceProject() != null);
if (request.getSource().getObjectName(false) != null) {
- request.getSource().delete();
-
+ projectManager.deleteBranch(request.getSourceProject(), request.getSourceBranch());
PullRequestChange change = new PullRequestChange();
change.setDate(new Date());
change.setData(new PullRequestSourceBranchDeleteData(note));
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
index 2045526cc5..e6ec7ebf01 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
@@ -1,7 +1,5 @@
package io.onedev.server.entitymanager.impl;
-import java.util.Iterator;
-
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -28,6 +26,7 @@ import io.onedev.server.persistence.annotation.Sessional;
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.util.Usage;
@Singleton
public class DefaultUserManager extends AbstractEntityManager<User> implements UserManager {
@@ -96,6 +95,20 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
@Transactional
@Override
public void delete(User user) {
+ Usage usage = new Usage();
+ for (Project project: projectManager.query()) {
+ for (BranchProtection protection: project.getBranchProtections())
+ usage.add(protection.onDeleteUser(user.getName()));
+ for (TagProtection protection: project.getTagProtections())
+ usage.add(protection.onDeleteUser(user.getName()));
+ usage.add(project.getIssueSetting().onDeleteUser(user.getName()));
+ usage.prefix("project '" + project.getName() + "': setting");
+ }
+
+ usage.add(settingManager.getIssueSetting().onDeleteUser(user.getName()).prefix("administration"));
+
+ usage.checkInUse("User '" + user.getName() + "'");
+
Query<?> query = getSession().createQuery("update PullRequest set submitter=null, submitterName=:submitterName "
+ "where submitter=:submitter");
query.setParameter("submitter", user);
@@ -157,20 +170,6 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
query.executeUpdate();
dao.remove(user);
-
- for (Project project: projectManager.query()) {
- for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {
- if (it.next().onDeleteUser(project, user.getName()))
- it.remove();
- }
- for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {
- if (it.next().onDeleteUser(user.getName()))
- it.remove();
- }
- project.getIssueSetting().onDeleteUser(user.getName());
- }
-
- settingManager.getIssueSetting().onDeleteUser(user.getName());
}
@Sessional
diff --git a/core/src/main/java/io/onedev/server/event/BuildCommitAware.java b/core/src/main/java/io/onedev/server/event/BuildCommitAware.java
new file mode 100644
index 0000000000..099f948410
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/BuildCommitAware.java
@@ -0,0 +1,9 @@
+package io.onedev.server.event;
+
+import org.eclipse.jgit.lib.ObjectId;
+
+public interface BuildCommitAware {
+
+ ObjectId getBuildCommit();
+
+}
diff --git a/core/src/main/java/io/onedev/server/event/BuildCommitsAware.java b/core/src/main/java/io/onedev/server/event/BuildCommitsAware.java
deleted file mode 100644
index 767be0fe4b..0000000000
--- a/core/src/main/java/io/onedev/server/event/BuildCommitsAware.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.onedev.server.event;
-
-import java.util.Collection;
-
-import org.eclipse.jgit.lib.ObjectId;
-
-public interface BuildCommitsAware {
-
- Collection<ObjectId> getBuildCommits();
-
-}
diff --git a/core/src/main/java/io/onedev/server/event/RefUpdated.java b/core/src/main/java/io/onedev/server/event/RefUpdated.java
index b908dd68ed..f98b563d35 100644
--- a/core/src/main/java/io/onedev/server/event/RefUpdated.java
+++ b/core/src/main/java/io/onedev/server/event/RefUpdated.java
@@ -1,14 +1,10 @@
package io.onedev.server.event;
-import java.util.Collection;
-
import org.eclipse.jgit.lib.ObjectId;
-import com.google.common.collect.Sets;
-
import io.onedev.server.model.Project;
-public class RefUpdated extends ProjectEvent implements BuildCommitsAware {
+public class RefUpdated extends ProjectEvent implements BuildCommitAware {
private final String refName;
@@ -36,11 +32,8 @@ public class RefUpdated extends ProjectEvent implements BuildCommitsAware {
}
@Override
- public Collection<ObjectId> getBuildCommits() {
- if (!newCommitId.equals(ObjectId.zeroId()))
- return Sets.newHashSet(newCommitId);
- else
- return Sets.newHashSet();
+ public ObjectId getBuildCommit() {
+ return newCommitId;
}
}
diff --git a/core/src/main/java/io/onedev/server/event/build/BuildEvent.java b/core/src/main/java/io/onedev/server/event/build/BuildEvent.java
index 4f22b696c1..3346a7db10 100644
--- a/core/src/main/java/io/onedev/server/event/build/BuildEvent.java
+++ b/core/src/main/java/io/onedev/server/event/build/BuildEvent.java
@@ -1,18 +1,15 @@
package io.onedev.server.event.build;
-import java.util.Collection;
import java.util.Date;
import org.eclipse.jgit.lib.ObjectId;
-import com.google.common.collect.Sets;
-
-import io.onedev.server.event.BuildCommitsAware;
+import io.onedev.server.event.BuildCommitAware;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.model.Build;
import io.onedev.server.model.User;
-public class BuildEvent extends ProjectEvent implements BuildCommitsAware {
+public class BuildEvent extends ProjectEvent implements BuildCommitAware {
private Build build;
@@ -30,8 +27,8 @@ public class BuildEvent extends ProjectEvent implements BuildCommitsAware {
}
@Override
- public Collection<ObjectId> getBuildCommits() {
- return Sets.newHashSet(ObjectId.fromString(build.getCommitHash()));
+ public ObjectId getBuildCommit() {
+ return ObjectId.fromString(build.getCommitHash());
}
}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java
index 4f5b9991d1..732ec62f90 100644
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java
@@ -1,18 +1,12 @@
package io.onedev.server.event.pullrequest;
-import java.util.Collection;
import java.util.Date;
-import org.eclipse.jgit.lib.ObjectId;
-
-import com.google.common.collect.Sets;
-
-import io.onedev.server.event.BuildCommitsAware;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-public abstract class PullRequestEvent extends ProjectEvent implements BuildCommitsAware {
+public abstract class PullRequestEvent extends ProjectEvent {
private final PullRequest request;
@@ -25,9 +19,4 @@ public abstract class PullRequestEvent extends ProjectEvent implements BuildComm
return request;
}
- @Override
- public Collection<ObjectId> getBuildCommits() {
- return Sets.newHashSet(request.getHeadCommit().copy());
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java
index 863a08bbec..ddb5ae2cb3 100644
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java
@@ -1,10 +1,7 @@
package io.onedev.server.event.pullrequest;
-import java.util.Collection;
import java.util.Date;
-import org.eclipse.jgit.lib.ObjectId;
-
import io.onedev.server.model.PullRequest;
public class PullRequestMergePreviewCalculated extends PullRequestEvent {
@@ -13,12 +10,4 @@ public class PullRequestMergePreviewCalculated extends PullRequestEvent {
super(null, new Date(), request);
}
- @Override
- public Collection<ObjectId> getBuildCommits() {
- Collection<ObjectId> commitIds = super.getBuildCommits();
- if (getRequest().getMergePreview().getMerged() != null)
- commitIds.add(ObjectId.fromString(getRequest().getMergePreview().getMerged()));
- return commitIds;
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java
index 95c772d8f3..941ecef3b9 100644
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java
@@ -1,12 +1,7 @@
package io.onedev.server.event.pullrequest;
-import java.util.Collection;
-
-import org.eclipse.jgit.lib.ObjectId;
-
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.support.pullrequest.MergePreview;
public class PullRequestOpened extends PullRequestEvent implements MarkdownAware {
@@ -19,13 +14,4 @@ public class PullRequestOpened extends PullRequestEvent implements MarkdownAware
return getRequest().getDescription();
}
- @Override
- public Collection<ObjectId> getBuildCommits() {
- Collection<ObjectId> commitIds = super.getBuildCommits();
- MergePreview preview = getRequest().getMergePreview();
- if (preview != null && preview.getMerged() != null)
- commitIds.add(ObjectId.fromString(preview.getMerged()));
- return commitIds;
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java b/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java
index 86222dda1e..32da680a7e 100644
--- a/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java
+++ b/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java
@@ -2,6 +2,7 @@ package io.onedev.server.git;
import java.io.IOException;
import java.net.InetAddress;
+import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
@@ -20,8 +21,11 @@ import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import com.google.common.base.Preconditions;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneException;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Project;
@@ -50,7 +54,7 @@ public class GitPreReceiveCallback extends HttpServlet {
this.userManager = userManager;
}
- private void error(Output output, @Nullable String refName, String... messages) {
+ private void error(Output output, @Nullable String refName, List<String> messages) {
output.markError();
output.writeLine();
output.writeLine("*******************************************************");
@@ -134,46 +138,59 @@ public class GitPreReceiveCallback extends HttpServlet {
if (refName.startsWith(PullRequestConstants.REFS_PREFIX) || refName.startsWith(PullRequestUpdate.REFS_PREFIX)) {
if (!user.asSubject().isPermitted(
new ProjectPermission(project.getFacade(), ProjectPrivilege.ADMINISTRATION))) {
- error(output, refName, "Only project administrators can update onedev refs.");
+ error(output, refName, Lists.newArrayList("Only project administrators can update onedev refs."));
break;
}
} else if (refName.startsWith(Constants.R_HEADS)) {
String branchName = Preconditions.checkNotNull(GitUtils.ref2branch(refName));
- String errorMessage = null;
+ List<String> errorMessages = new ArrayList<>();
BranchProtection protection = project.getBranchProtection(branchName, user);
if (protection != null) {
if (oldObjectId.equals(ObjectId.zeroId())) {
if (protection.isNoCreation())
- errorMessage = "Can not create this branch according to branch protection setting";
+ errorMessages.add("Can not create this branch according to branch protection setting");
} else if (newObjectId.equals(ObjectId.zeroId())) {
- if (protection.isNoDeletion())
- errorMessage = "Can not delete this branch according to branch protection setting";
+ if (protection.isNoDeletion())
+ errorMessages.add("Can not delete this branch according to branch protection setting");
} else if (!GitUtils.isMergedInto(project.getRepository(), gitEnvs, oldObjectId, newObjectId)) {
- errorMessage = "Can not force-push to this branch according to branch protection setting";
+ errorMessages.add("Can not force-push to this branch according to branch protection setting");
} else if (projectManager.isPushNeedsQualityCheck(user, project, branchName, oldObjectId, newObjectId, gitEnvs)) {
- error(output, refName,
- "Your changes need to be reviewed/verified. Please submit pull request instead");
+ errorMessages.add("Your changes need to be reviewed/verified. Please submit pull request instead");
}
}
- if (errorMessage != null)
- error(output, refName, errorMessage);
+ if (errorMessages.isEmpty()) {
+ try {
+ projectManager.onDeleteBranch(project, branchName);
+ } catch (OneException e) {
+ errorMessages.addAll(Splitter.on("\n").splitToList(e.getMessage()));
+ }
+ }
+ if (!errorMessages.isEmpty())
+ error(output, refName, errorMessages);
} else if (refName.startsWith(Constants.R_TAGS)) {
String tagName = Preconditions.checkNotNull(GitUtils.ref2tag(refName));
- String errorMessage = null;
+ List<String> errorMessages = new ArrayList<>();
TagProtection protection = project.getTagProtection(tagName, user);
if (protection != null) {
if (oldObjectId.equals(ObjectId.zeroId())) {
if (protection.isNoCreation())
- errorMessage = "Can not create this tag according to tag protection setting";
+ errorMessages.add("Can not create this tag according to tag protection setting");
} else if (newObjectId.equals(ObjectId.zeroId())) {
if (protection.isNoDeletion())
- errorMessage = "Can not delete this tag according to tag protection setting";
+ errorMessages.add("Can not delete this tag according to tag protection setting");
} else if (protection.isNoUpdate()) {
- errorMessage = "Can not update this tag according to tag protection setting";
+ errorMessages.add("Can not update this tag according to tag protection setting");
}
}
- if (errorMessage != null)
- error(output, refName, errorMessage);
+ if (errorMessages.isEmpty()) {
+ try {
+ projectManager.onDeleteTag(project, tagName);
+ } catch (OneException e) {
+ errorMessages.addAll(Splitter.on("\n").splitToList(e.getMessage()));
+ }
+ }
+ if (!errorMessages.isEmpty())
+ error(output, refName, errorMessages);
}
field = field.substring(40);
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 449396cf1d..3f95036730 100644
--- a/core/src/main/java/io/onedev/server/model/Project.java
+++ b/core/src/main/java/io/onedev/server/model/Project.java
@@ -61,15 +61,17 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.fasterxml.jackson.annotation.JsonView;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
+import com.google.common.collect.Sets;
import io.onedev.commons.launcher.loader.ListenerRegistry;
-import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LinearRange;
import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.StringUtils;
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.ci.CISpec;
import io.onedev.server.ci.detector.CISpecDetector;
import io.onedev.server.entitymanager.BuildQuerySettingManager;
@@ -851,40 +853,6 @@ public class Project extends AbstractEntity {
return submodules;
}
-
- public void deleteBranch(String branch) {
- String refName = GitUtils.branch2ref(branch);
- ObjectId commitId = getObjectId(refName, true);
- try {
- git().branchDelete().setForce(true).setBranchNames(branch).call();
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
- }
-
- Subject subject = SecurityUtils.getSubject();
- OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- OneDev.getInstance(SessionManager.class).runAsync(new Runnable() {
-
- @Override
- public void run() {
- ThreadContext.bind(subject);
- try {
- Project project = OneDev.getInstance(ProjectManager.class).load(getId());
- OneDev.getInstance(ListenerRegistry.class).post(
- new RefUpdated(project, refName, commitId, ObjectId.zeroId()));
- } finally {
- ThreadContext.unbindSubject();
- }
- }
-
- });
- }
-
- });
- }
public void createBranch(String branchName, String branchRevision) {
try {
@@ -967,40 +935,6 @@ public class Project extends AbstractEntity {
}
}
- public void deleteTag(String tag) {
- String refName = GitUtils.tag2ref(tag);
- ObjectId commitId = getRevCommit(refName, true).getId();
- try {
- git().tagDelete().setTags(tag).call();
- } catch (GitAPIException e) {
- throw new RuntimeException(e);
- }
-
- Subject subject = SecurityUtils.getSubject();
- OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- OneDev.getInstance(SessionManager.class).runAsync(new Runnable() {
-
- @Override
- public void run() {
- ThreadContext.bind(subject);
- try {
- Project project = OneDev.getInstance(ProjectManager.class).load(getId());
- OneDev.getInstance(ListenerRegistry.class).post(
- new RefUpdated(project, refName, commitId, ObjectId.zeroId()));
- } finally {
- ThreadContext.unbindSubject();
- }
- }
-
- });
- }
-
- });
- }
-
public Collection<CodeComment> getCodeComments() {
return codeComments;
}
@@ -1393,4 +1327,31 @@ public class Project extends AbstractEntity {
return null;
}
+ public boolean isCommitOnBranches(ObjectId commitId, String branches) {
+ CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);
+ Collection<ObjectId> descendants = commitInfoManager.getDescendants(this, Sets.newHashSet(commitId));
+ descendants.add(commitId);
+
+ Matcher matcher = new ChildAwareMatcher();
+ PatternSet branchPatterns = PatternSet.fromString(branches);
+ for (RefInfo ref: getBranches()) {
+ String branchName = Preconditions.checkNotNull(GitUtils.ref2branch(ref.getRef().getName()));
+ if (descendants.contains(ref.getPeeledObj()) && branchPatterns.matches(matcher, branchName))
+ return true;
+ }
+ return false;
+ }
+
+ public boolean isCommitOnTags(ObjectId commitId, String tags) {
+ Matcher matcher = new ChildAwareMatcher();
+ PatternSet tagPatterns = PatternSet.fromString(tags);
+ for (RefInfo ref: getTags()) {
+ String tagName = Preconditions.checkNotNull(GitUtils.ref2tag(ref.getRef().getName()));
+ if (commitId.equals(ref.getPeeledObj()) && tagPatterns.matches(matcher, tagName))
+ return true;
+ }
+ return false;
+ }
+
+
}
diff --git a/core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/core/src/main/java/io/onedev/server/model/support/BranchProtection.java
index 20f100e9b3..7815ab200e 100644
--- a/core/src/main/java/io/onedev/server/model/support/BranchProtection.java
+++ b/core/src/main/java/io/onedev/server/model/support/BranchProtection.java
@@ -2,7 +2,6 @@ package io.onedev.server.model.support;
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.annotation.Nullable;
@@ -13,6 +12,7 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;
import io.onedev.server.ci.JobDependency;
import io.onedev.server.model.Project;
+import io.onedev.server.util.Usage;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.reviewrequirement.ReviewRequirement;
import io.onedev.server.util.usermatcher.Anyone;
@@ -126,8 +126,8 @@ public class BranchProtection implements Serializable {
this.jobDependencies = jobDependencies;
}
- @Editable(order=700, description="Optionally specify additional users to review particular paths. For each changed file, "
- + "the first matched file protection setting will be used")
+ @Editable(order=700, description="Optionally specify additional users to review "
+ + "particular paths. For each changed file, the first matched file protection setting will be used")
@NotNull(message="may not be empty")
public List<FileProtection> getFileProtections() {
return fileProtections;
@@ -156,20 +156,20 @@ public class BranchProtection implements Serializable {
}
}
- public boolean onDeleteGroup(String groupName) {
- submitter = UserMatcher.onDeleteGroup(submitter, groupName);
- reviewRequirement = ReviewRequirement.onDeleteGroup(reviewRequirement, groupName);
-
- for (Iterator<FileProtection> it = getFileProtections().iterator(); it.hasNext();) {
- FileProtection protection = it.next();
- String reviewRequirement = ReviewRequirement.onDeleteGroup(protection.getReviewRequirement(), groupName);
- if (reviewRequirement != null)
- protection.setReviewRequirement(reviewRequirement);
- else
- it.remove();
+ public Usage onDeleteGroup(String groupName) {
+ Usage usage = new Usage();
+ if (UserMatcher.isUsingGroup(submitter, groupName))
+ usage.add("if submitted by");
+ if (ReviewRequirement.isUsingGroup(reviewRequirement, groupName))
+ usage.add("required reviewers");
+
+ for (FileProtection protection: getFileProtections()) {
+ if (ReviewRequirement.isUsingGroup(protection.getReviewRequirement(), groupName)) {
+ usage.add("file protections");
+ break;
+ }
}
-
- return false;
+ return usage.prefix("branch protection '" + getBranches() + "'");
}
public void onRenameUser(Project project, String oldName, String newName) {
@@ -182,27 +182,20 @@ public class BranchProtection implements Serializable {
}
}
- public boolean onDeleteUser(Project project, String userName) {
- submitter = UserMatcher.onDeleteUser(submitter, userName);
- reviewRequirement = ReviewRequirement.onDeleteUser(reviewRequirement, userName);
-
- for (Iterator<FileProtection> it = getFileProtections().iterator(); it.hasNext();) {
- FileProtection protection = it.next();
- String reviewRequirement = ReviewRequirement.onDeleteUser(protection.getReviewRequirement(), userName);
- if (reviewRequirement != null)
- protection.setReviewRequirement(reviewRequirement);
- else
- it.remove();
+ public Usage onDeleteUser(String userName) {
+ Usage usage = new Usage();
+ if (UserMatcher.isUsingUser(submitter, userName))
+ usage.add("if submitted by");
+ if (ReviewRequirement.isUsingUser(reviewRequirement, userName))
+ usage.add("required reviewers");
+
+ for (FileProtection protection: getFileProtections()) {
+ if (ReviewRequirement.isUsingUser(protection.getReviewRequirement(), userName)) {
+ usage.add("file protections");
+ break;
+ }
}
- return false;
+ return usage.prefix("branch protection '" + getBranches() + "'");
}
- public boolean onBranchDeleted(String branchName) {
- PatternSet patternSet = PatternSet.fromString(getBranches());
- patternSet.getIncludes().remove(branchName);
- patternSet.getExcludes().remove(branchName);
- setBranches(patternSet.toString());
- return getBranches().length() == 0;
- }
-
}
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 502ec11608..6306e37124 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
@@ -15,7 +15,7 @@ import io.onedev.server.web.util.SuggestionUtils;
public class FileProtection implements Serializable {
private static final long serialVersionUID = 1L;
-
+
private String paths;
private String reviewRequirement;
diff --git a/core/src/main/java/io/onedev/server/model/support/ProjectAndRevision.java b/core/src/main/java/io/onedev/server/model/support/ProjectAndRevision.java
index 197a2d40c2..739ec9caee 100644
--- a/core/src/main/java/io/onedev/server/model/support/ProjectAndRevision.java
+++ b/core/src/main/java/io/onedev/server/model/support/ProjectAndRevision.java
@@ -101,10 +101,6 @@ public class ProjectAndRevision implements Serializable {
return getRevision().equals(getProject().getDefaultBranch());
}
- public void delete() {
- getProject().deleteBranch(getRevision());
- }
-
public Project getProject() {
return OneDev.getInstance(ProjectManager.class).load(projectId);
}
diff --git a/core/src/main/java/io/onedev/server/model/support/TagProtection.java b/core/src/main/java/io/onedev/server/model/support/TagProtection.java
index d86132b495..16ae90ffdb 100644
--- a/core/src/main/java/io/onedev/server/model/support/TagProtection.java
+++ b/core/src/main/java/io/onedev/server/model/support/TagProtection.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
import org.hibernate.validator.constraints.NotEmpty;
+import io.onedev.server.util.Usage;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.usermatcher.Anyone;
import io.onedev.server.util.usermatcher.UserMatcher;
@@ -91,26 +92,30 @@ public class TagProtection implements Serializable {
submitter = UserMatcher.onRenameGroup(submitter, oldName, newName);
}
- public boolean onDeleteGroup(String groupName) {
- submitter = UserMatcher.onDeleteGroup(submitter, groupName);
- return false;
+ public Usage onDeleteGroup(String groupName) {
+ Usage usage = new Usage();
+ if (UserMatcher.isUsingGroup(submitter, groupName))
+ usage.add("if performed by");
+ return usage.prefix("tag protection '" + getTags() + "'");
}
public void onRenameUser(String oldName, String newName) {
submitter = UserMatcher.onRenameUser(submitter, oldName, newName);
}
- public boolean onDeleteUser(String userName) {
- submitter = UserMatcher.onDeleteUser(submitter, userName);
- return false;
+ public Usage onDeleteUser(String userName) {
+ Usage usage = new Usage();
+ if (UserMatcher.isUsingUser(submitter, userName))
+ usage.add("if performed by");
+ return usage.prefix("tag protection '" + getTags() + "'");
}
- public boolean onTagDeleted(String tagName) {
+ public Usage getTagUsage(String tagName) {
+ Usage usage = new Usage();
PatternSet patternSet = PatternSet.fromString(getTags());
- patternSet.getIncludes().remove(tagName);
- patternSet.getExcludes().remove(tagName);
- setTags(patternSet.toString());
- return getTags().length() == 0;
+ if (patternSet.getIncludes().contains(tagName) || patternSet.getExcludes().contains(tagName))
+ usage.add("tag protection '" + getTags() + "'");
+ return usage;
}
}
diff --git a/core/src/main/java/io/onedev/server/model/support/authenticator/Authenticator.java b/core/src/main/java/io/onedev/server/model/support/authenticator/Authenticator.java
index ebf1f1b26a..8053628c96 100644
--- a/core/src/main/java/io/onedev/server/model/support/authenticator/Authenticator.java
+++ b/core/src/main/java/io/onedev/server/model/support/authenticator/Authenticator.java
@@ -44,10 +44,6 @@ public abstract class Authenticator implements Serializable {
defaultGroupNames.set(index, newName);
}
- public void onDeleteGroup(String groupName) {
- defaultGroupNames.remove(groupName);
- }
-
public abstract Authenticated authenticate(UsernamePasswordToken token) throws AuthenticationException;
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
index fab49530db..a26d98e500 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
@@ -23,6 +23,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.OneContext;
+import io.onedev.server.util.Usage;
import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
@@ -319,7 +320,8 @@ public class BoardSpec implements Serializable {
}
}
- public boolean onDeleteUser(GlobalIssueSetting issueSetting, String userName) {
+ @Nullable
+ public Usage onDeleteUser(GlobalIssueSetting issueSetting, String userName) {
InputSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());
if (fieldSpec instanceof UserChoiceInput) {
for (Iterator<String> it = getColumns().iterator(); it.hasNext();) {
@@ -327,7 +329,10 @@ public class BoardSpec implements Serializable {
it.remove();
}
}
- return getColumns().size() < 2;
+ if (getColumns().size() < 2)
+ return null;
+ else
+ return new Usage();
}
public void onRenameField(GlobalIssueSetting issueSetting, String oldName, String newName) {
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java
index 0b284e897a..675b5d1190 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java
@@ -16,6 +16,7 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.util.Usage;
import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution;
import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution.FixType;
@@ -124,19 +125,40 @@ public class IssueSetting implements Serializable {
}
}
- public void onDeleteUser(String userName) {
+ public Usage onDeleteBranch(String branchName) {
+ Usage usage = new Usage();
if (transitionSpecs != null) {
- for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {
- if (it.next().onDeleteUser(userName))
- it.remove();
- }
+ for (TransitionSpec transitionSpec: transitionSpecs)
+ usage.add(transitionSpec.onDeleteBranch(branchName));
+ }
+ return usage.prefix("issue setting");
+ }
+
+ public Usage onDeleteTag(String tagName) {
+ Usage usage = new Usage();
+ if (transitionSpecs != null) {
+ for (TransitionSpec transitionSpec: transitionSpecs)
+ usage.add(transitionSpec.onDeleteTag(tagName));
+ }
+ return usage.prefix("issue setting");
+ }
+
+ public Usage onDeleteUser(String userName) {
+ Usage usage = new Usage();
+ if (transitionSpecs != null) {
+ for (TransitionSpec transition: transitionSpecs)
+ usage.add(transition.onDeleteUser(userName));
}
if (boardSpecs != null) {
- for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {
- if (it.next().onDeleteUser(getGlobalSetting(), userName))
+ for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {
+ Usage usageInBoard = it.next().onDeleteUser(getGlobalSetting(), userName);
+ if (usageInBoard != null)
+ usage.add(usageInBoard);
+ else
it.remove();
}
}
+ return usage.prefix("issue setting");
}
public void onRenameGroup(String oldName, String newName) {
@@ -146,13 +168,13 @@ public class IssueSetting implements Serializable {
}
}
- public void onDeleteGroup(String groupName) {
+ public Usage onDeleteGroup(String groupName) {
+ Usage usage = new Usage();
if (transitionSpecs != null) {
- for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {
- if (it.next().onDeleteGroup(groupName))
- it.remove();
- }
+ for (TransitionSpec transition: transitionSpecs)
+ usage.add(transition.onDeleteGroup(groupName));
}
+ return usage.prefix("issue setting");
}
public Collection<String> getUndefinedFields(Project project) {
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
index 461183ae27..0bf4d34ea3 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
@@ -21,10 +21,13 @@ import io.onedev.server.model.support.issue.transitionprerequisite.TransitionPre
import io.onedev.server.model.support.issue.transitionprerequisite.ValueIsNotAnyOf;
import io.onedev.server.model.support.issue.transitionprerequisite.ValueIsOneOf;
import io.onedev.server.model.support.issue.transitionprerequisite.ValueMatcher;
+import io.onedev.server.model.support.issue.transitiontrigger.BuildSuccessfulTrigger;
import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
+import io.onedev.server.model.support.issue.transitiontrigger.PullRequestTrigger;
import io.onedev.server.model.support.issue.transitiontrigger.TransitionTrigger;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.util.Input;
+import io.onedev.server.util.Usage;
import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
@@ -136,13 +139,39 @@ public class TransitionSpec implements Serializable {
}
}
- public boolean onDeleteUser(String userName) {
+ public Usage onDeleteBranch(String branchName) {
+ Usage usage = new Usage();
+ TransitionTrigger trigger = getTrigger();
+ if (trigger instanceof BuildSuccessfulTrigger) {
+ BuildSuccessfulTrigger buildSuccessful = (BuildSuccessfulTrigger) trigger;
+ usage.add(buildSuccessful.onDeleteBranch(branchName).prefix("build successful trigger"));
+ } else if (trigger instanceof PullRequestTrigger) {
+ PullRequestTrigger pullRequestTrigger = (PullRequestTrigger) trigger;
+ if (pullRequestTrigger.getBranch().equals(branchName))
+ usage.add("pull request trigger: target branch");
+ }
+ return usage.prefix("transitions: " + fromStates + "->" + toState);
+ }
+
+ public Usage onDeleteTag(String tagName) {
+ Usage usage = new Usage();
+ TransitionTrigger trigger = getTrigger();
+ if (trigger instanceof BuildSuccessfulTrigger) {
+ BuildSuccessfulTrigger buildSuccessful = (BuildSuccessfulTrigger) trigger;
+ usage.add(buildSuccessful.onDeleteTag(tagName).prefix("build successful trigger"));
+ }
+ return usage.prefix("transitions: " + fromStates + "->" + toState);
+ }
+
+ public Usage onDeleteUser(String userName) {
+ Usage usage = new Usage();
TransitionTrigger trigger = getTrigger();
if (trigger instanceof PressButtonTrigger) {
PressButtonTrigger pressButton = (PressButtonTrigger) trigger;
- pressButton.setAuthorized(UserMatcher.onDeleteUser(pressButton.getAuthorized(), userName));
+ if (UserMatcher.isUsingUser(pressButton.getAuthorized(), userName))
+ usage.add("press button trigger: authorization");
}
- return false;
+ return usage.prefix("transitions: " + fromStates + "->" + toState);
}
public void onRenameGroup(String oldName, String newName) {
@@ -153,13 +182,15 @@ public class TransitionSpec implements Serializable {
}
}
- public boolean onDeleteGroup(String groupName) {
+ public Usage onDeleteGroup(String groupName) {
+ Usage usage = new Usage();
TransitionTrigger trigger = getTrigger();
if (trigger instanceof PressButtonTrigger) {
PressButtonTrigger pressButton = (PressButtonTrigger) trigger;
- pressButton.setAuthorized(UserMatcher.onDeleteGroup(pressButton.getAuthorized(), groupName));
+ if (UserMatcher.isUsingGroup(pressButton.getAuthorized(), groupName))
+ usage.add("press button trigger: authorization");
}
- return false;
+ return usage.prefix("transitions: " + fromStates + "->" + toState);
}
public void onRenameState(String oldName, String newName) {
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java
index 17e0f41f50..3107bff4df 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java
@@ -2,16 +2,25 @@ package io.onedev.server.model.support.issue.transitiontrigger;
import org.hibernate.validator.constraints.NotEmpty;
-import io.onedev.server.web.editable.annotation.JobChoice;
+import io.onedev.server.util.Usage;
+import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.web.editable.annotation.BranchPatterns;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.JobChoice;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
+import io.onedev.server.web.editable.annotation.TagPatterns;
@Editable(order=400, name="Build fixing the issue is successful")
public class BuildSuccessfulTrigger implements TransitionTrigger {
private static final long serialVersionUID = 1L;
-
+
private String jobName;
+ private String branches;
+
+ private String tags;
+
@Editable(order=100, description="Specify job of the build")
@JobChoice
@NotEmpty
@@ -23,4 +32,44 @@ public class BuildSuccessfulTrigger implements TransitionTrigger {
this.jobName = jobName;
}
+ @Editable(order=200, name="Restricted Branches", description="Optionally specify branches the build should be "
+ + "running on. Use space to separate multipe branches, and use * or ? for wildcard match")
+ @BranchPatterns
+ @NameOfEmptyValue("No restriction")
+ public String getBranches() {
+ return branches;
+ }
+
+ public void setBranches(String branches) {
+ this.branches = branches;
+ }
+
+ @Editable(order=300, name="Restricted Tags", description="Optionally specify tags the build should be running on. "
+ + "Use space to separate multipe tags, and use * or ? for wildcard match")
+ @TagPatterns
+ @NameOfEmptyValue("No restriction")
+ public String getTags() {
+ return tags;
+ }
+
+ public void setTags(String tags) {
+ this.tags = tags;
+ }
+
+ public Usage onDeleteBranch(String branchName) {
+ Usage usage = new Usage();
+ PatternSet patternSet = PatternSet.fromString(getBranches());
+ if (patternSet.getIncludes().contains(branchName) || patternSet.getExcludes().contains(branchName))
+ usage.add("restricted branches");
+ return usage;
+ }
+
+ public Usage onDeleteTag(String tagName) {
+ Usage usage = new Usage();
+ PatternSet patternSet = PatternSet.fromString(getTags());
+ if (patternSet.getIncludes().contains(tagName) || patternSet.getExcludes().contains(tagName))
+ usage.add("restricted tags");
+ return usage;
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java
index 22dd40d6e8..71dd6e25dd 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java
@@ -8,7 +8,7 @@ import io.onedev.server.web.editable.annotation.Editable;
public abstract class PullRequestTrigger implements TransitionTrigger {
private static final long serialVersionUID = 1L;
-
+
private String branch;
@Editable(name="Target Branch")
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 63e38bf5e2..1896038854 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
@@ -12,23 +12,19 @@ import org.eclipse.jgit.lib.ObjectId;
import org.hibernate.validator.constraints.NotEmpty;
import org.slf4j.Logger;
-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.ci.job.cache.JobCache;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.git.RefInfo;
import io.onedev.server.model.Project;
+import io.onedev.server.util.Usage;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.validation.annotation.ExecutorName;
+import io.onedev.server.web.editable.annotation.BranchPatterns;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.editable.annotation.Patterns;
import io.onedev.server.web.editable.annotation.ProjectPatterns;
+import io.onedev.server.web.editable.annotation.TagPatterns;
@Editable
public abstract class JobExecutor implements Serializable {
@@ -45,6 +41,8 @@ public abstract class JobExecutor implements Serializable {
private String branches;
+ private String tags;
+
private String jobs;
private String environments;
@@ -70,11 +68,11 @@ public abstract class JobExecutor implements Serializable {
this.name = name;
}
- @Editable(order=10000, name="Applicable Projects", group="Job Match Settings",
- description="Optionally specify space-separated projects applicable for this executor. Use * or ? for wildcard match. "
- + "Leave empty to match all projects")
+ @Editable(order=10000, name="Restricted Projects", group="Job Restrictions",
+ description="Optionally specify projects applicable for this executor. Use space to "
+ + "separate multiple projects, and use * or ? for wildcard match")
@ProjectPatterns
- @NameOfEmptyValue("All")
+ @NameOfEmptyValue("No restrictions")
public String getProjects() {
return projects;
}
@@ -83,12 +81,11 @@ public abstract class JobExecutor implements Serializable {
this.projects = projects;
}
- @Editable(order=10100, name="Applicable Branches", group="Job Match Settings",
- 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
- @NameOfEmptyValue("All")
+ @Editable(order=10100, name="Restricted Branches", group="Job Restrictions",
+ description="Optionally specify branches the job should be running on in order to use this executor. "
+ + "Use space to separate multiple projects, and use * or ? for wildcard match")
+ @BranchPatterns
+ @NameOfEmptyValue("No restrictions")
public String getBranches() {
return branches;
}
@@ -97,11 +94,24 @@ public abstract class JobExecutor implements Serializable {
this.branches = branches;
}
- @Editable(order=10200, name="Applicable Jobs", group="Job Match Settings",
- description="Optionally specify space-separated jobs applicable for this executor. Use * or ? for wildcard match. "
- + "Leave empty to match all jobs")
+ @Editable(order=10110, name="Restricted Tags", group="Job Restrictions",
+ description="Optionally specify tags the job should be running on in order to use this executor. "
+ + "Use space to separate multiple projects, and use * or ? for wildcard match")
+ @TagPatterns
+ @NameOfEmptyValue("No restrictions")
+ public String getTags() {
+ return tags;
+ }
+
+ public void setTags(String tags) {
+ this.tags = tags;
+ }
+
+ @Editable(order=10200, name="Restricted Jobs", group="Job Restrictions",
+ description="Optionally specify jobs applicable for this executor. Use space to separate "
+ + "multiple jobs, and use * or ? for wildcard match")
@Patterns
- @NameOfEmptyValue("All")
+ @NameOfEmptyValue("No restrictions")
public String getJobs() {
return jobs;
}
@@ -110,11 +120,11 @@ public abstract class JobExecutor implements Serializable {
this.jobs = jobs;
}
- @Editable(order=10300, name="Applicable Environments", group="Job Match Settings",
- description="Optionally specify space-separated environments applicable for this executor. Use * or ? for wildcard match. "
- + "Leave empty to match all images")
+ @Editable(order=10300, name="Restricted Environments", group="Job Restrictions",
+ description="Optionally specify job environments applicable for this executor. Use space to "
+ + "separate multiple environments, and use * or ? for wildcard match")
@Patterns
- @NameOfEmptyValue("All")
+ @NameOfEmptyValue("No restrictions")
public String getEnvironments() {
return environments;
}
@@ -142,25 +152,31 @@ public abstract class JobExecutor implements Serializable {
public final boolean isApplicable(Project project, ObjectId commitId, String jobName, String environment) {
Matcher matcher = new ChildAwareMatcher();
- if (isEnabled()
+ return isEnabled()
&& (getProjects() == null || PatternSet.fromString(getProjects()).matches(matcher, project.getName()))
&& (getJobs() == null || PatternSet.fromString(getJobs()).matches(matcher, jobName))
- && (getEnvironments() == null || PatternSet.fromString(getEnvironments()).matches(matcher, environment))) {
- if (getBranches() == null)
- return true;
-
- CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);
- Collection<ObjectId> descendants = commitInfoManager.getDescendants(project, Sets.newHashSet(commitId));
- descendants.add(commitId);
-
- PatternSet branchPatterns = PatternSet.fromString(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 true;
- }
- }
- return false;
+ && (getEnvironments() == null || PatternSet.fromString(getEnvironments()).matches(matcher, environment))
+ && (getBranches() == null || project.isCommitOnBranches(commitId, getBranches())
+ && (getTags() == null || project.isCommitOnTags(commitId, getTags())));
+ }
+
+ public Usage getProjectUsage(String projectName) {
+ Usage usage = new Usage();
+ if (getProjects() != null) {
+ PatternSet patternSet = PatternSet.fromString(getProjects());
+ if (patternSet.getIncludes().contains(projectName) || patternSet.getExcludes().contains(projectName))
+ usage.add("restricted projects");
+ }
+ return usage.prefix(getName()).prefix("job executor '" + getName() + "'");
+ }
+
+ public void onProjectRenamed(String oldName, String newName) {
+ PatternSet patternSet = PatternSet.fromString(getProjects());
+ if (patternSet.getIncludes().remove(oldName))
+ patternSet.getIncludes().add(newName);
+ if (patternSet.getExcludes().remove(oldName))
+ patternSet.getExcludes().add(newName);
+ setProjects(patternSet.toString());
}
public boolean hasCapacity() {
diff --git a/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java b/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java
index 533c43b733..b15cdc0dcf 100644
--- a/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java
+++ b/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java
@@ -27,6 +27,7 @@ import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.OrCriteria;
import io.onedev.server.search.entity.issue.StateCriteria;
import io.onedev.server.util.IssueConstants;
+import io.onedev.server.util.Usage;
import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.IssueChoiceInput;
@@ -435,16 +436,8 @@ public class GlobalIssueSetting implements Serializable {
}
}
- Set<String> deletedFields = new HashSet<>();
- for (Iterator<InputSpec> it = getFieldSpecs().iterator(); it.hasNext();) {
- InputSpec field = it.next();
- if (field.onDeleteInput(fieldName)) {
- it.remove();
- deletedFields.add(field.getName());
- }
- }
- for (String deletedField: deletedFields)
- onDeleteField(deletedField);
+ for (InputSpec field: getFieldSpecs())
+ field.onDeleteInput(fieldName);
}
public void onRenameUser(String oldName, String newName) {
@@ -456,27 +449,21 @@ public class GlobalIssueSetting implements Serializable {
board.onRenameUser(this, oldName, newName);
}
- public void onDeleteUser(String userName) {
- for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {
- TransitionSpec transition = it.next();
- if (transition.onDeleteUser(userName))
- it.remove();
- }
- for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {
- if (it.next().onDeleteUser(this, userName))
+ public Usage onDeleteUser(String userName) {
+ Usage usage = new Usage();
+ for (TransitionSpec transition: getDefaultTransitionSpecs())
+ usage.add(transition.onDeleteUser(userName));
+ for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {
+ Usage usageInBoard = it.next().onDeleteUser(this, userName);
+ if (usageInBoard != null)
+ usage.add(usageInBoard);
+ else
it.remove();
}
+ for (InputSpec field: getFieldSpecs())
+ usage.add(field.onDeleteUser(userName));
- Set<String> deletedFields = new HashSet<>();
- for (Iterator<InputSpec> it = getFieldSpecs().iterator(); it.hasNext();) {
- InputSpec field = it.next();
- if (field.onDeleteUser(userName)) {
- it.remove();
- deletedFields.add(field.getName());
- }
- }
- for (String deletedField: deletedFields)
- onDeleteField(deletedField);
+ return usage.prefix("issue setting");
}
public void onRenameGroup(String oldName, String newName) {
@@ -486,22 +473,15 @@ public class GlobalIssueSetting implements Serializable {
field.onRenameGroup(oldName, newName);
}
- public void onDeleteGroup(String groupName) {
- for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {
- TransitionSpec transition = it.next();
- if (transition.onDeleteGroup(groupName))
- it.remove();
- }
- Set<String> deletedFields = new HashSet<>();
- for (Iterator<InputSpec> it = getFieldSpecs().iterator(); it.hasNext();) {
- InputSpec field = it.next();
- if (field.onDeleteGroup(groupName)) {
- it.remove();
- deletedFields.add(field.getName());
- }
- }
- for (String deletedField: deletedFields)
- onDeleteField(deletedField);
+ public Usage onDeleteGroup(String groupName) {
+ Usage usage = new Usage();
+ for (TransitionSpec transition: getDefaultTransitionSpecs())
+ usage.add(transition.onDeleteGroup(groupName));
+
+ for (InputSpec field: getFieldSpecs())
+ usage.add(field.onDeleteGroup(groupName));
+
+ return usage.prefix("issue setting");
}
public StateSpec getInitialStateSpec() {
diff --git a/core/src/main/java/io/onedev/server/util/Usage.java b/core/src/main/java/io/onedev/server/util/Usage.java
new file mode 100644
index 0000000000..6171df2080
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/Usage.java
@@ -0,0 +1,56 @@
+package io.onedev.server.util;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import io.onedev.server.OneException;
+
+public class Usage implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private final List<String> places = new ArrayList<>();
+
+ public List<String> getPlaces() {
+ return places;
+ }
+
+ public Usage add(String place) {
+ places.add(place);
+ return this;
+ }
+
+ public Usage add(Usage usage) {
+ places.addAll(usage.getPlaces());
+ return this;
+ }
+
+ public Usage prefix(String place) {
+ for (int i=0; i<places.size(); i++)
+ places.set(i, place + ": " + places.get(i));
+ return this;
+ }
+
+ @Nullable
+ public String getInUseMessage(String thing) {
+ if (!places.isEmpty()) {
+ StringBuilder builder = new StringBuilder(thing + " is still being used in below places:\n");
+ for (String place: places)
+ builder.append(" " + place).append("\n");
+ String message = builder.toString();
+ return message.substring(0, message.length()-1);
+ } else {
+ return null;
+ }
+ }
+
+ public void checkInUse(String thing) {
+ String inUseMessage = getInUseMessage(thing);
+ if (inUseMessage != null)
+ throw new OneException(inUseMessage);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java
index 7b48fceb9a..377a3cade5 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java
@@ -18,6 +18,7 @@ import com.google.common.collect.Lists;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.util.OneContext;
+import io.onedev.server.util.Usage;
import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.util.inputspec.showcondition.ShowCondition;
import io.onedev.server.util.inputspec.showcondition.ValueIsNotAnyOf;
@@ -266,10 +267,9 @@ public abstract class InputSpec implements Serializable {
}
}
- public boolean onDeleteInput(String inputName) {
+ public void onDeleteInput(String inputName) {
if (showCondition != null && showCondition.getInputName().equals(inputName))
showCondition = null;
- return false;
}
public static Class<?> defineClass(String className, Collection<InputSpec> inputs) {
@@ -312,12 +312,12 @@ public abstract class InputSpec implements Serializable {
}
- public boolean onDeleteUser(String userName) {
- return false;
+ public Usage onDeleteUser(String userName) {
+ return new Usage();
}
- public boolean onDeleteGroup(String groupName) {
- return false;
+ public Usage onDeleteGroup(String groupName) {
+ return new Usage();
}
public abstract List<String> convertToStrings(@Nullable Object object);
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java
index c8e7b02ccb..2c5a3fed97 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java
@@ -9,6 +9,7 @@ import javax.validation.Validator;
import javax.validation.constraints.NotNull;
import io.onedev.server.OneDev;
+import io.onedev.server.util.Usage;
import io.onedev.server.util.facade.GroupFacade;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider.AllGroups;
@@ -106,15 +107,13 @@ public class GroupChoiceInput extends InputSpec {
}
@Override
- public boolean onDeleteGroup(String groupName) {
- if (super.onDeleteGroup(groupName))
- return true;
+ public Usage onDeleteGroup(String groupName) {
if (defaultValueProvider instanceof SpecifiedDefaultValue) {
SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;
if (specifiedDefaultValue.getValue().equals(groupName))
- defaultValueProvider = null;
+ defaultValueProvider = null;
}
- return false;
+ return new Usage();
}
}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java
index 0ebd873631..9f3691187a 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java
@@ -10,6 +10,7 @@ import javax.validation.constraints.NotNull;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.util.Usage;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.GroupUsers;
@@ -84,15 +85,13 @@ public class UserChoiceInput extends InputSpec {
}
@Override
- public boolean onDeleteUser(String userName) {
- if (super.onDeleteUser(userName))
- return true;
+ public Usage onDeleteUser(String userName) {
if (defaultValueProvider instanceof SpecifiedDefaultValue) {
SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;
if (specifiedDefaultValue.getValue().equals(userName))
defaultValueProvider = null;
}
- return false;
+ return new Usage();
}
@Override
@@ -105,15 +104,14 @@ public class UserChoiceInput extends InputSpec {
}
@Override
- public boolean onDeleteGroup(String groupName) {
- if (super.onDeleteGroup(groupName))
- return true;
+ public Usage onDeleteGroup(String groupName) {
+ Usage usage = new Usage();
if (choiceProvider instanceof GroupUsers) {
GroupUsers groupUsers = (GroupUsers) choiceProvider;
if (groupUsers.getGroupName().equals(groupName))
- return true;
+ usage.add("available choices");
}
- return false;
+ return usage.prefix("field '" + getName() + "'");
}
@Override
diff --git a/core/src/main/java/io/onedev/server/util/patternset/PatternSet.java b/core/src/main/java/io/onedev/server/util/patternset/PatternSet.java
index 52d3a682e5..65353873b2 100644
--- a/core/src/main/java/io/onedev/server/util/patternset/PatternSet.java
+++ b/core/src/main/java/io/onedev/server/util/patternset/PatternSet.java
@@ -7,6 +7,8 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
+import javax.annotation.Nullable;
+
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
import org.antlr.v4.runtime.CharStream;
@@ -80,7 +82,7 @@ public class PatternSet implements Serializable {
return files;
}
- public static PatternSet fromString(String patternSetString) {
+ public static PatternSet fromString(@Nullable String patternSetString) {
Set<String> includes = new HashSet<>();
Set<String> excludes = new HashSet<>();
diff --git a/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java
index fa0ae88314..ceaa0c1b6b 100644
--- a/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java
+++ b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java
@@ -1,7 +1,6 @@
package io.onedev.server.util.reviewrequirement;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -145,32 +144,31 @@ public class ReviewRequirement {
return reviewRequirement.toString();
}
- @Nullable
- public static String onDeleteGroup(String reviewRequirementString, String groupName) {
+ public static String onRenameUser(String reviewRequirementString, String oldName, String newName) {
ReviewRequirement reviewRequirement = fromString(reviewRequirementString);
- for (Iterator<Map.Entry<Group, Integer>> it = reviewRequirement.getGroups().entrySet().iterator(); it.hasNext();) {
- if (it.next().getKey().getName().equals(groupName))
- it.remove();
+ for (User user: reviewRequirement.getUsers()) {
+ if (user.getName().equals(oldName))
+ user.setName(newName);
}
return reviewRequirement.toString();
}
- public static String onRenameUser(String reviewRequirementString, String oldName, String newName) {
+ public static boolean isUsingUser(String reviewRequirementString, String userName) {
ReviewRequirement reviewRequirement = fromString(reviewRequirementString);
for (User user: reviewRequirement.getUsers()) {
- if (user.getName().equals(oldName))
- user.setName(newName);
+ if (user.getName().equals(userName))
+ return true;
}
- return reviewRequirement.toString();
+ return false;
}
- public static String onDeleteUser(String reviewRequirementString, String userName) {
+ public static boolean isUsingGroup(String reviewRequirementString, String groupName) {
ReviewRequirement reviewRequirement = fromString(reviewRequirementString);
- for (Iterator<User> it = reviewRequirement.getUsers().iterator(); it.hasNext();) {
- if (it.next().getName().equals(userName))
- it.remove();
+ for (Group group: reviewRequirement.getGroups().keySet()) {
+ if (group.getName().equals(groupName))
+ return true;
}
- return reviewRequirement.toString();
+ return false;
}
@Nullable
diff --git a/core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java b/core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java
index 4a08b178c3..77e282c775 100644
--- a/core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java
+++ b/core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java
@@ -2,7 +2,6 @@ package io.onedev.server.util.usermatcher;
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
@@ -182,24 +181,6 @@ public class UserMatcher implements Serializable {
return userMatcher.toString();
}
- private static void onDeleteGroup(List<UserMatcherCriteria> criterias, String groupName) {
- for (Iterator<UserMatcherCriteria> it = criterias.iterator(); it.hasNext();) {
- UserMatcherCriteria criteria = it.next();
- if (criteria instanceof SpecifiedGroup) {
- SpecifiedGroup specifiedGroup = (SpecifiedGroup) criteria;
- if (specifiedGroup.getGroupName().equals(groupName))
- it.remove();
- }
- }
- }
-
- public static String onDeleteGroup(String userMatcherString, String groupName) {
- UserMatcher userMatcher = fromString(userMatcherString);
- onDeleteGroup(userMatcher.getCriterias(), groupName);
- onDeleteGroup(userMatcher.getExceptCriterias(), groupName);
- return userMatcher.toString();
- }
-
private static void onRenameUser(List<UserMatcherCriteria> criterias, String oldName, String newName) {
for (UserMatcherCriteria criteria: criterias) {
if (criteria instanceof SpecifiedUser) {
@@ -217,22 +198,38 @@ public class UserMatcher implements Serializable {
return userMatcher.toString();
}
- private static void onDeleteUser(List<UserMatcherCriteria> criterias, String userName) {
- for (Iterator<UserMatcherCriteria> it = criterias.iterator(); it.hasNext();) {
- UserMatcherCriteria criteria = it.next();
+ private static boolean isUsingUser(List<UserMatcherCriteria> criterias, String userName) {
+ for (UserMatcherCriteria criteria: criterias) {
if (criteria instanceof SpecifiedUser) {
SpecifiedUser specifiedUser = (SpecifiedUser) criteria;
if (specifiedUser.getUserName().equals(userName))
- it.remove();
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static boolean isUsingUser(String userMatcherString, String userName) {
+ UserMatcher userMatcher = fromString(userMatcherString);
+ return isUsingUser(userMatcher.getCriterias(), userName)
+ || isUsingUser(userMatcher.getExceptCriterias(), userName);
+ }
+
+ private static boolean isUsingGroup(List<UserMatcherCriteria> criterias, String groupName) {
+ for (UserMatcherCriteria criteria: criterias) {
+ if (criteria instanceof SpecifiedGroup) {
+ SpecifiedGroup specifiedGroup = (SpecifiedGroup) criteria;
+ if (specifiedGroup.getGroupName().equals(groupName))
+ return true;
}
}
+ return false;
}
- public static String onDeleteUser(String userMatcherString, String userName) {
+ public static boolean isUsingGroup(String userMatcherString, String groupName) {
UserMatcher userMatcher = fromString(userMatcherString);
- onDeleteUser(userMatcher.getCriterias(), userName);
- onDeleteUser(userMatcher.getExceptCriterias(), userName);
- return userMatcher.toString();
+ return isUsingGroup(userMatcher.getCriterias(), groupName)
+ || isUsingGroup(userMatcher.getExceptCriterias(), groupName);
}
}
diff --git a/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionModal.java b/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionModal.java
index 0d6811cfeb..512b0430f8 100644
--- a/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionModal.java
+++ b/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionModal.java
@@ -20,8 +20,8 @@ public abstract class ConfirmActionModal extends ModalPanel {
@Override
protected void onConfirm(AjaxRequestTarget target) {
- close();
ConfirmActionModal.this.onConfirm(target);
+ close();
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.html b/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.html
index e56acce854..c47fc0b5cd 100644
--- a/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.html
@@ -7,7 +7,8 @@
<h4 id="modal-title" class="modal-title">Please Confirm</h4>
</div>
<div class="modal-body">
- <div wicket:id="message" class="message"></div>
+ <div wicket:id="message" class="message"></div>
+ <div wicket:id="feedback" class="feedback"></div>
<input wicket:id="input" class="form-control confirm">
</div>
<div class="modal-footer">
diff --git a/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.java b/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.java
index 72564ddf5a..68ea8d86c9 100644
--- a/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.java
@@ -4,6 +4,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
@@ -13,6 +14,8 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.unbescape.javascript.JavaScriptEscape;
+import io.onedev.commons.utils.HtmlUtils;
+import io.onedev.server.OneException;
import io.onedev.server.web.component.link.PreventDefaultAjaxLink;
@SuppressWarnings("serial")
@@ -42,13 +45,21 @@ abstract class ConfirmActionPanel extends Panel {
}
}));
+
+ add(new FencedFeedbackPanel("feedback", this).setEscapeModelStrings(false));
+
add(new WebMarkupContainer("input").setVisible(getConfirmInput() != null));
add(new PreventDefaultAjaxLink<Void>("ok") {
@Override
public void onClick(AjaxRequestTarget target) {
- onConfirm(target);
+ try {
+ onConfirm(target);
+ } catch (OneException e) {
+ error(HtmlUtils.formatAsHtml(e.getMessage()));
+ target.add(ConfirmActionPanel.this);
+ }
}
});
diff --git a/core/src/main/java/io/onedev/server/web/component/confirmaction/confirm-action.css b/core/src/main/java/io/onedev/server/web/component/confirmaction/confirm-action.css
index 7a9503ed49..8632006e3c 100644
--- a/core/src/main/java/io/onedev/server/web/component/confirmaction/confirm-action.css
+++ b/core/src/main/java/io/onedev/server/web/component/confirmaction/confirm-action.css
@@ -1,6 +1,9 @@
.confirm-action .message {
font-size: 13px;
}
+.confirm-action .feedback {
+ margin-top: 16px;
+}
.confirm-action input.confirm {
margin-top: 20px;
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.html b/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.html
index dfba9da7c3..34e713d173 100644
--- a/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.html
@@ -1,6 +1,7 @@
<wicket:panel>
<form wicket:id="form" class="leave-confirm">
- <div wicket:id="editor"></div>
+ <div wicket:id="editor"></div>
+ <div wicket:id="feedback"></div>
<div class="actions clearfix">
<input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit">
<a wicket:id="delete" class="btn btn-danger pull-right">Delete</a>
diff --git a/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java b/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java
index 31781bdd45..362c663a3d 100644
--- a/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java
@@ -3,6 +3,7 @@ package io.onedev.server.web.component.user.profileedit;
import java.io.Serializable;
import org.apache.wicket.Session;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.GenericPanel;
@@ -10,7 +11,9 @@ import org.apache.wicket.model.IModel;
import com.google.common.collect.Sets;
+import io.onedev.commons.utils.HtmlUtils;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
@@ -87,6 +90,8 @@ public class ProfileEditPanel extends GenericPanel<User> {
};
form.add(editor);
+ form.add(new FencedFeedbackPanel("feedback", form).setEscapeModelStrings(false));
+
form.add(new Link<Void>("delete") {
@Override
@@ -98,8 +103,12 @@ public class ProfileEditPanel extends GenericPanel<User> {
@Override
public void onClick() {
- OneDev.getInstance(UserManager.class).delete(getUser());
- setResponsePage(UserListPage.class);
+ try {
+ OneDev.getInstance(UserManager.class).delete(getUser());
+ setResponsePage(UserListPage.class);
+ } catch (OneException e) {
+ error(HtmlUtils.formatAsHtml(e.getMessage()));
+ }
}
}.add(new ConfirmOnClick("Do you really want to delete user '" + getUser().getDisplayName() + "'?")));
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 a0fd648a27..7192245eb2 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
@@ -1,6 +1,7 @@
package io.onedev.server.web.editable;
import java.lang.reflect.Method;
+import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.model.IModel;
@@ -44,8 +45,12 @@ public class BranchPatternsEditSupport implements EditSupport {
@Override
protected List<InputSuggestion> suggest(String matchWith) {
- Project project = ((ProjectPage)getPage()).getProject();
- return SuggestionUtils.suggestBranches(project, matchWith);
+ if (getPage() instanceof ProjectPage) {
+ Project project = ((ProjectPage)getPage()).getProject();
+ return SuggestionUtils.suggestBranches(project, matchWith);
+ } else {
+ return new ArrayList<>();
+ }
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
index 450b005a6c..b5ce614a4c 100644
--- a/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
@@ -5,6 +5,7 @@ import java.util.Set;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
+import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.event.Broadcast;
@@ -66,6 +67,16 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {
}));
+ setOutputMarkupId(true);
+ }
+
+ protected void markFormDirty(AjaxRequestTarget target) {
+ String script = String.format(""
+ + "var $form = $('#%s').closest('form');"
+ + "if ($form.closest('.blob-edit').length == 0)"
+ + " onedev.server.form.markDirty($form);",
+ getMarkupId());
+ target.prependJavaScript(script);
}
protected void onPropertyUpdating(IPartialPageRequestHandler target) {
diff --git a/core/src/main/java/io/onedev/server/web/editable/TagPatternsEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/TagPatternsEditSupport.java
index b31decb97c..6cde20c6c0 100644
--- a/core/src/main/java/io/onedev/server/web/editable/TagPatternsEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/TagPatternsEditSupport.java
@@ -1,6 +1,7 @@
package io.onedev.server.web.editable;
import java.lang.reflect.Method;
+import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.model.IModel;
@@ -43,8 +44,12 @@ public class TagPatternsEditSupport implements EditSupport {
@Override
protected List<InputSuggestion> suggest(String matchWith) {
- Project project = ((ProjectPage)getPage()).getProject();
- return SuggestionUtils.suggestTags(project, matchWith);
+ if (getPage() instanceof ProjectPage) {
+ Project project = ((ProjectPage)getPage()).getProject();
+ return SuggestionUtils.suggestTags(project, matchWith);
+ } else {
+ return new ArrayList<>();
+ }
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
index adf98db5e9..edce2dbdab 100644
--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
@@ -35,11 +35,11 @@ import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.ErrorContext;
import io.onedev.server.web.editable.PathElement;
import io.onedev.server.web.editable.PathElement.Named;
-import io.onedev.server.web.editable.annotation.ExcludedProperties;
import io.onedev.server.web.editable.PropertyContext;
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.editable.annotation.ExcludedProperties;
@SuppressWarnings("serial")
public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {
@@ -144,7 +144,8 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
-
+ markFormDirty(target);
+
Component lastRow;
if (rows.size() != 0)
lastRow = rows.get(rows.size() - 1);
@@ -189,6 +190,8 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {
@SuppressWarnings("deprecation")
@Override
protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ markFormDirty(target);
+
/*
List<Component> children = new ArrayList<>();
for (Component child: rows)
@@ -255,9 +258,8 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
-
+ markFormDirty(target);
target.appendJavaScript($(row).chain("remove").get());
- target.appendJavaScript(String.format("onedev.server.form.markDirty($('#%s'));", form.getMarkupId(true)));
rows.remove(row);
target.add(noElements);
onPropertyUpdating(target);
diff --git a/core/src/main/java/io/onedev/server/web/editable/editable.css b/core/src/main/java/io/onedev/server/web/editable/editable.css
index 2751c7a3d8..42d8f6bdb4 100644
--- a/core/src/main/java/io/onedev/server/web/editable/editable.css
+++ b/core/src/main/java/io/onedev/server/web/editable/editable.css
@@ -4,6 +4,9 @@
.editable>.group {
margin-bottom: 12px;
}
+.editable>.group:last-child {
+ margin-bottom: 0;
+}
.editable>.group>a {
display: block;
text-decoration: none;
@@ -38,6 +41,9 @@
vertical-align: top;
padding: 0 8px 16px 0;
}
+.editable>.bean-properties>table>tbody>tr:last-child>td {
+ padding-bottom: 0;
+}
.editable td.value>div:last-child>div:last-child>table>tbody>tr:last-child>td.value,
.editable td.value>div:last-child>div:last-child>div:last-child>div:last-child>table>tbody>tr:last-child>td.value {
padding-bottom: 0;
@@ -108,10 +114,12 @@
font-style: italic;
}
+.editable ul.feedbackPanel {
+ margin: 10px 0;
+}
.bean-editor .bean-list>table>tbody>tr>td {
border-top: none;
}
-
.bean-editor .select2-container {
width: 100%;
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.java
index b541a135f1..2e639a595b 100644
--- a/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.java
@@ -87,7 +87,7 @@ class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
protected void onSave(AjaxRequestTarget target) {
- markDirty(target);
+ markFormDirty(target);
modal.close();
onPropertyUpdating(target);
target.add(DependencyListEditPanel.this);
@@ -128,7 +128,7 @@ class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
protected void onSave(AjaxRequestTarget target) {
- markDirty(target);
+ markFormDirty(target);
modal.close();
onPropertyUpdating(target);
target.add(DependencyListEditPanel.this);
@@ -173,7 +173,7 @@ class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public void onClick(AjaxRequestTarget target) {
- markDirty(target);
+ markFormDirty(target);
dependencies.remove(rowModel.getObject());
onPropertyUpdating(target);
target.add(DependencyListEditPanel.this);
@@ -222,19 +222,8 @@ class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {
}
}.sortable("tbody"));
-
- setOutputMarkupId(true);
}
- private void markDirty(AjaxRequestTarget target) {
- String script = String.format(""
- + "var $form = $('#%s').closest('form');"
- + "if ($form.closest('.blob-edit').length == 0)"
- + " onedev.server.form.markDirty($form);",
- getMarkupId());
- target.prependJavaScript(script);
- }
-
@Override
public void onEvent(IEvent<?> event) {
super.onEvent(event);
diff --git a/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditPanel.java
index f4a0bd36bf..e0125d54bd 100644
--- a/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditPanel.java
@@ -66,7 +66,7 @@ class OutcomeListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
protected void onSave(AjaxRequestTarget target) {
- markDirty(target);
+ markFormDirty(target);
modal.close();
onPropertyUpdating(target);
target.add(OutcomeListEditPanel.this);
@@ -97,7 +97,7 @@ class OutcomeListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
protected void onSave(AjaxRequestTarget target) {
- markDirty(target);
+ markFormDirty(target);
modal.close();
onPropertyUpdating(target);
target.add(OutcomeListEditPanel.this);
@@ -131,7 +131,7 @@ class OutcomeListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public void onClick(AjaxRequestTarget target) {
- markDirty(target);
+ markFormDirty(target);
outcomes.remove(rowModel.getObject());
onPropertyUpdating(target);
target.add(OutcomeListEditPanel.this);
@@ -180,19 +180,8 @@ class OutcomeListEditPanel extends PropertyEditor<List<Serializable>> {
}
}.sortable("tbody"));
-
- setOutputMarkupId(true);
}
- private void markDirty(AjaxRequestTarget target) {
- String script = String.format(""
- + "var $form = $('#%s').closest('form');"
- + "if ($form.closest('.blob-edit').length == 0)"
- + " onedev.server.form.markDirty($form);",
- getMarkupId());
- target.prependJavaScript(script);
- }
-
@Override
public void onEvent(IEvent<?> event) {
super.onEvent(event);
diff --git a/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java
index 9494d3f996..6474d68fe1 100644
--- a/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java
@@ -69,7 +69,7 @@ class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
protected void onSave(AjaxRequestTarget target) {
- markDirty(target);
+ markFormDirty(target);
modal.close();
onPropertyUpdating(target);
target.add(ParamSpecListEditPanel.this);
@@ -100,7 +100,7 @@ class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
protected void onSave(AjaxRequestTarget target) {
- markDirty(target);
+ markFormDirty(target);
modal.close();
onPropertyUpdating(target);
target.add(ParamSpecListEditPanel.this);
@@ -143,7 +143,7 @@ class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public void onClick(AjaxRequestTarget target) {
- markDirty(target);
+ markFormDirty(target);
params.remove(rowModel.getObject());
onPropertyUpdating(target);
target.add(ParamSpecListEditPanel.this);
@@ -192,19 +192,8 @@ class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {
}
}.sortable("tbody"));
-
- setOutputMarkupId(true);
}
- private void markDirty(AjaxRequestTarget target) {
- String script = String.format(""
- + "var $form = $('#%s').closest('form');"
- + "if ($form.closest('.blob-edit').length == 0)"
- + " onedev.server.form.markDirty($form);",
- getMarkupId());
- target.prependJavaScript(script);
- }
-
@Override
public void onEvent(IEvent<?> event) {
super.onEvent(event);
diff --git a/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.java
index 534f19b5ff..4a0b66a7b4 100644
--- a/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.java
@@ -77,7 +77,7 @@ class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
protected void onSave(AjaxRequestTarget target) {
- markDirty(target);
+ markFormDirty(target);
modal.close();
onPropertyUpdating(target);
target.add(TriggerListEditPanel.this);
@@ -113,7 +113,7 @@ class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
protected void onSave(AjaxRequestTarget target) {
- markDirty(target);
+ markFormDirty(target);
modal.close();
onPropertyUpdating(target);
target.add(TriggerListEditPanel.this);
@@ -153,7 +153,7 @@ class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public void onClick(AjaxRequestTarget target) {
- markDirty(target);
+ markFormDirty(target);
triggers.remove(rowModel.getObject());
onPropertyUpdating(target);
target.add(TriggerListEditPanel.this);
@@ -202,8 +202,6 @@ class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {
}
}.sortable("tbody"));
-
- setOutputMarkupId(true);
}
@Override
@@ -216,15 +214,6 @@ class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {
}
}
- private void markDirty(AjaxRequestTarget target) {
- String script = String.format(""
- + "var $form = $('#%s').closest('form');"
- + "if ($form.closest('.blob-edit').length == 0)"
- + " onedev.server.form.markDirty($form);",
- getMarkupId());
- target.prependJavaScript(script);
- }
-
@Override
protected List<Serializable> convertInputToValue() throws ConversionException {
List<Serializable> value = new ArrayList<>();
diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java
index feed739bdf..ebd83a1729 100644
--- a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java
@@ -119,6 +119,8 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa
public void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
+ markFormDirty(target);
+
Component lastRow;
if (rows.size() != 0)
lastRow = rows.get(rows.size() - 1);
@@ -179,6 +181,8 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa
// Do not use code above as removing components outside of a container and add again
// can cause the fenced feedback panel not functioning properly
+ markFormDirty(target);
+
int fromIndex = from.getItemIndex();
int toIndex = to.getItemIndex();
if (fromIndex < toIndex) {
@@ -259,7 +263,8 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- target.appendJavaScript(String.format("onedev.server.form.markDirty($('#%s'));", form.getMarkupId(true)));
+ markFormDirty(target);
+
target.appendJavaScript($(row).chain("remove").get());
rows.remove(row);
target.add(noElements);
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html
index 6cdf0916e8..402c4d6d95 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html
@@ -8,8 +8,9 @@
<div class="pull-left">
<a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New Group</a>
</div>
- </div>
+ </div>
<div class="body">
+ <div wicket:id="feedback"></div>
<table wicket:id="groups" class="groups table table-hover"></table>
</div>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
index cc26bee857..3438038610 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
@@ -11,6 +11,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColu
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
@@ -26,7 +27,9 @@ import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
+import io.onedev.commons.utils.HtmlUtils;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.model.Group;
import io.onedev.server.persistence.dao.EntityCriteria;
@@ -95,6 +98,8 @@ public class GroupListPage extends AdministrationPage {
});
+ add(new FencedFeedbackPanel("feedback", this).setEscapeModelStrings(false));
+
List<IColumn<Group, Void>> columns = new ArrayList<>();
columns.add(new AbstractColumn<Group, Void>(Model.of("Name")) {
@@ -154,8 +159,12 @@ public class GroupListPage extends AdministrationPage {
@Override
public void onClick() {
- OneDev.getInstance(GroupManager.class).delete(rowModel.getObject());
- setResponsePage(GroupListPage.class);
+ try {
+ OneDev.getInstance(GroupManager.class).delete(rowModel.getObject());
+ setResponsePage(GroupListPage.class);
+ } catch (OneException e) {
+ getPage().error(HtmlUtils.formatAsHtml(e.getMessage()));
+ }
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.html b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.html
index 14cde65396..e42454acf0 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.html
@@ -15,7 +15,8 @@
<input wicket:id="canCreateProjects" class="can-create-projects" type="checkbox"/> Can Create Projects
<div class="help-block">Check this to make members of this group able to fork/create projects</div>
</label>
- </div>
+ </div>
+ <div wicket:id="feedback"></div>
<div class="actions clearfix">
<input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit">
<a wicket:id="delete" class="btn btn-danger pull-right">Delete</a>
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java
index 3bb504bc01..0dfe6fae26 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java
@@ -8,6 +8,7 @@ import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -15,7 +16,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.collect.Sets;
+import io.onedev.commons.utils.HtmlUtils;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.model.Group;
import io.onedev.server.security.SecurityUtils;
@@ -130,12 +133,18 @@ public class GroupProfilePage extends GroupPage {
@Override
public void onClick() {
- OneDev.getInstance(GroupManager.class).delete(getGroup());
- setResponsePage(GroupListPage.class);
+ try {
+ OneDev.getInstance(GroupManager.class).delete(getGroup());
+ setResponsePage(GroupListPage.class);
+ } catch (OneException e) {
+ error(HtmlUtils.formatAsHtml(e.getMessage()));
+ }
}
}.add(new ConfirmOnClick("Do you really want to delete group '" + getGroup().getName() + "'?")));
+ form.add(new FeedbackPanel("feedback").setEscapeModelStrings(false));
+
fragment.add(form);
add(fragment);
} else {
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html b/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html
index 595b71fe8a..c874466c9a 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html
@@ -10,6 +10,7 @@
</div>
</div>
<div class="body">
+ <div wicket:id="feedback"></div>
<table wicket:id="users" class="users table table-hover"></table>
</div>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
index 5e6e53804b..df220157c8 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
@@ -11,6 +11,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColu
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
@@ -27,7 +28,9 @@ import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
+import io.onedev.commons.utils.HtmlUtils;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.EntityCriteria;
@@ -103,6 +106,8 @@ public class UserListPage extends AdministrationPage {
});
+ add(new FencedFeedbackPanel("feedback", this).setEscapeModelStrings(false));
+
List<IColumn<User, Void>> columns = new ArrayList<>();
columns.add(new AbstractColumn<User, Void>(Model.of("Login Name")) {
@@ -160,8 +165,12 @@ public class UserListPage extends AdministrationPage {
@Override
public void onClick() {
- OneDev.getInstance(UserManager.class).delete(rowModel.getObject());
- setResponsePage(UserListPage.class);
+ try {
+ OneDev.getInstance(UserManager.class).delete(rowModel.getObject());
+ setResponsePage(UserListPage.class);
+ } catch (OneException e) {
+ getPage().error(HtmlUtils.formatAsHtml(e.getMessage()));
+ }
}
@Override
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 18a8e6a481..037bca9f4a 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
@@ -105,10 +105,6 @@ form .required {
color: #B94A48;
}
-.bean-editor ul.feedbackPanel {
- margin: 10px 0;
-}
-
form>.test-feedback {
margin-top: 16px;
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
index 6b699c8a6b..ce590c0827 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html
@@ -87,15 +87,18 @@
</form>
</wicket:fragment>
<wicket:fragment wicket:id="confirmDeleteBranchFrag">
- <div class="modal-header">
- <button wicket:id="close" type="button" class="close">&times;</button>
- <h4 class="modal-title">Please confirm</h4>
- </div>
- <div wicket:id="body" class="modal-body"></div>
- <div class="modal-footer">
- <a wicket:id="delete" class="btn btn-danger">Delete</a>
- <a wicket:id="cancel" class="btn btn-default">Cancel</a>
- </div>
+ <div class="confirm-delete-branch">
+ <div class="modal-header">
+ <button wicket:id="close" type="button" class="close">&times;</button>
+ <h4 class="modal-title">Please confirm</h4>
+ </div>
+ <div wicket:id="body" class="modal-body"></div>
+ <div wicket:id="feedback" class="feedback"></div>
+ <div class="modal-footer">
+ <a wicket:id="delete" class="btn btn-danger">Delete</a>
+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>
+ </div>
+ </div>
</wicket:fragment>
<wicket:fragment wicket:id="openRequestsFrag">
There are <a wicket:id="openRequests">open pull requests</a> against branch <span wicket:id="branch"></span>.
diff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
index b09cc7ab21..2f3e452e58 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
@@ -23,6 +23,7 @@ import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -53,7 +54,10 @@ import org.eclipse.jgit.revwalk.filter.RevFilter;
import com.google.common.base.Preconditions;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.commons.utils.HtmlUtils;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
+import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
@@ -634,6 +638,7 @@ public class ProjectBranchesPage extends ProjectPage {
@Override
protected Component newContent(String id, ModalPanel modal) {
Fragment fragment = new Fragment(id, "confirmDeleteBranchFrag", ProjectBranchesPage.this);
+ fragment.add(new FencedFeedbackPanel("feedback", fragment).setEscapeModelStrings(false));
PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class);
if (!pullRequestManager.queryOpen(new ProjectAndBranch(getProject(), branch)).isEmpty()) {
Fragment bodyFrag = new Fragment("body", "openRequestsFrag", ProjectBranchesPage.this);
@@ -652,14 +657,19 @@ public class ProjectBranchesPage extends ProjectPage {
@Override
public void onClick(AjaxRequestTarget target) {
- getProject().deleteBranch(branch);
- if (branch.equals(baseBranch)) {
- baseBranch = getProject().getDefaultBranch();
- target.add(baseChoice);
+ try {
+ OneDev.getInstance(ProjectManager.class).deleteBranch(getProject(), branch);
+ if (branch.equals(baseBranch)) {
+ baseBranch = getProject().getDefaultBranch();
+ target.add(baseChoice);
+ }
+ target.add(branchesContainer);
+ newPagingNavigation(target);
+ modal.close();
+ } catch (OneException e) {
+ error(HtmlUtils.formatAsHtml(e.getMessage()));
+ target.add(fragment);
}
- target.add(branchesContainer);
- newPagingNavigation(target);
- modal.close();
}
});
@@ -679,6 +689,7 @@ public class ProjectBranchesPage extends ProjectPage {
}
});
+ fragment.setOutputMarkupId(true);
return fragment;
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css b/core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css
index 2f4293f6f8..f5882f7f5b 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css
@@ -61,8 +61,6 @@
background: #ccc;
border-radius: 2px 0 0 2px;
}
-
-
#searching-branches {
position: absolute;
left: 50%;
@@ -70,7 +68,3 @@
z-index: 100;
display: none;
}
-
-.confirm-delete-branch>.modal-body {
- font-size: 16px;
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index ce7b6d8d50..d90e597180 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -65,6 +65,7 @@ import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.cache.UserInfoManager;
import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.entitymanager.PullRequestManager;
@@ -969,8 +970,15 @@ public abstract class PullRequestDetailPage extends ProjectPage {
target.add(hint);
target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");
} else {
- operation.operate(request, noteInput.getModelObject());
- setResponsePage(PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(getPullRequest(), position));
+ try {
+ operation.operate(request, noteInput.getModelObject());
+ setResponsePage(PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(getPullRequest(), position));
+ } catch (OneException e) {
+ error(e.getMessage());
+ target.add(feedback);
+ target.add(hint);
+ target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");
+ }
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
index b50be38bff..08dbb4e39a 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html
@@ -10,8 +10,9 @@
<div class="pull-left">
<a wicket:id="createTag" class="btn btn-success"><i class="fa fa-plus"></i> Create</a>
</div>
- </div>
+ </div>
<div wicket:id="tagsContainer">
+ <div wicket:id="feedback"></div>
<div wicket:id="tags" class="tag">
<div class="title">
<a wicket:id="tagLink" class="name"><span wicket:id="name"></span></a>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
index b2c0fa23d3..2f7c1156a4 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
@@ -11,6 +11,7 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -35,7 +36,11 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevTag;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.commons.utils.HtmlUtils;
import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
+import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
@@ -271,6 +276,8 @@ public class ProjectTagsPage extends ProjectPage {
});
tagsContainer.setOutputMarkupPlaceholderTag(true);
+ tagsContainer.add(new FencedFeedbackPanel("feedback", tagsContainer).setEscapeModelStrings(false));
+
tagsContainer.add(tagsView = new PageableListView<RefInfo>("tags", tagsModel,
io.onedev.server.web.WebConstants.PAGE_SIZE) {
@@ -357,9 +364,13 @@ public class ProjectTagsPage extends ProjectPage {
@Override
public void onClick(AjaxRequestTarget target) {
- getProject().deleteTag(tagName);
+ try {
+ OneDev.getInstance(ProjectManager.class).deleteTag(getProject(), tagName);
+ newPagingNavigation(target);
+ } catch (OneException e) {
+ tagsContainer.error(HtmlUtils.formatAsHtml(e.getMessage()));
+ }
target.add(tagsContainer);
- newPagingNavigation(target);
}
@Override