The Unified and Autonomous Development Platform
Make branch/tag protection rules additive instead of using the first matched
Robin Shendf21f15e6d5e
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 68751dace1..e3e53e18ed 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -684,22 +684,22 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Transactional@Overridepublic void checkQuality(PullRequest request) {- BranchProtection branchProtection = request.getTargetProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());- if (branchProtection != null) {- checkReviews(ReviewRequirement.fromString(branchProtection.getReviewRequirement()), request.getLatestUpdate());+ BranchProtection branchProtection = request.getTargetProject().getBranchProtection(+ request.getTargetBranch(), request.getSubmitter());+ checkReviews(branchProtection.getParsedReviewRequirement(), request.getLatestUpdate());- Set<FileProtection> checkedFileProtections = new HashSet<>();- for (int i=request.getSortedUpdates().size()-1; i>=0; i--) {- if (checkedFileProtections.containsAll(branchProtection.getFileProtections()))- break;- PullRequestUpdate update = request.getSortedUpdates().get(i);- for (String file: update.getChangedFiles()) {- FileProtection fileProtection = branchProtection.getFileProtection(file);- if (fileProtection != null- && !checkedFileProtections.contains(fileProtection)) {- checkedFileProtections.add(fileProtection);- checkReviews(ReviewRequirement.fromString(fileProtection.getReviewRequirement()), update);- }+ ReviewRequirement checkedRequirement = ReviewRequirement.fromString(null);+ for (int i=request.getSortedUpdates().size()-1; i>=0; i--) {+ if (branchProtection.getFileProtections().stream().allMatch(+ it->checkedRequirement.covers(it.getParsedReviewRequirement()))) {+ break;+ }+ PullRequestUpdate update = request.getSortedUpdates().get(i);+ for (String file: update.getChangedFiles()) {+ FileProtection fileProtection = branchProtection.getFileProtection(file);+ if (!checkedRequirement.covers(fileProtection.getParsedReviewRequirement())) {+ checkedRequirement.mergeWith(fileProtection.getParsedReviewRequirement());+ checkReviews(fileProtection.getParsedReviewRequirement(), update);}}}@@ -727,12 +727,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequesttry {Collection<String> requiredJobNames;BranchProtection protection = request.getTargetProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());- if (protection != null) {- requiredJobNames = protection.getRequiredJobs(request.getTargetProject(), request.getTargetBranch(),- request.getTarget().getObjectId(), commitId, new HashMap<>());- } else {- requiredJobNames = new HashSet<>();- }+ requiredJobNames = protection.getRequiredJobs(request.getTargetProject(), request.getTargetBranch(),+ request.getTarget().getObjectId(), commitId, new HashMap<>());BuildSpec buildSpec = project.getBuildSpec(commitId);if (buildSpec != null) {for (Job job: buildSpec.getJobs()) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.javaindex 4a2d12c30b..6939c25d43 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java@@ -69,7 +69,7 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Uif (oldName != null && !oldName.equals(user.getName())) {for (Project project: projectManager.query()) {for (BranchProtection protection: project.getBranchProtections())- protection.onRenameUser(project, oldName, user.getName());+ protection.onRenameUser(oldName, user.getName());for (TagProtection protection: project.getTagProtections())protection.onRenameUser(oldName, user.getName());project.getIssueSetting().onRenameUser(oldName, user.getName());diff --git a/server-core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java b/server-core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.javaindex c9e72eba4a..5b780a2778 100644--- a/server-core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java+++ b/server-core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java@@ -139,20 +139,18 @@ public class GitPreReceiveCallback extends HttpServlet {String branchName = Preconditions.checkNotNull(GitUtils.ref2branch(refName));List<String> errorMessages = new ArrayList<>();BranchProtection protection = project.getBranchProtection(branchName, user);- if (protection != null) {- if (oldObjectId.equals(ObjectId.zeroId())) {- if (protection.isNoCreation())- errorMessages.add("Can not create this branch according to branch protection setting");- } else if (newObjectId.equals(ObjectId.zeroId())) {- if (protection.isNoDeletion())- errorMessages.add("Can not delete this branch according to branch protection setting");- } else if (protection.isNoForcedPush()- && !GitUtils.isMergedInto(project.getRepository(), gitEnvs, oldObjectId, newObjectId)) {- errorMessages.add("Can not force-push to this branch according to branch protection setting");- } else if (protection.isReviewRequiredForPush(user, project, branchName, oldObjectId, newObjectId, gitEnvs)) {- errorMessages.add("Review required for your change. Please submit pull request instead");- }- }+ if (oldObjectId.equals(ObjectId.zeroId())) {+ if (protection.isNoCreation())+ errorMessages.add("Can not create this branch according to branch protection setting");+ } else if (newObjectId.equals(ObjectId.zeroId())) {+ if (protection.isNoDeletion())+ errorMessages.add("Can not delete this branch according to branch protection setting");+ } else if (protection.isNoForcedPush()+ && !GitUtils.isMergedInto(project.getRepository(), gitEnvs, oldObjectId, newObjectId)) {+ errorMessages.add("Can not force-push to this branch according to branch protection setting");+ } else if (protection.isReviewRequiredForPush(user, project, branchName, oldObjectId, newObjectId, gitEnvs)) {+ errorMessages.add("Review required for your change. Please submit pull request instead");+ }if (errorMessages.isEmpty()&& !oldObjectId.equals(ObjectId.zeroId())&& !newObjectId.equals(ObjectId.zeroId())@@ -172,17 +170,15 @@ public class GitPreReceiveCallback extends HttpServlet {String tagName = Preconditions.checkNotNull(GitUtils.ref2tag(refName));List<String> errorMessages = new ArrayList<>();TagProtection protection = project.getTagProtection(tagName, user);- if (protection != null) {- if (oldObjectId.equals(ObjectId.zeroId())) {- if (protection.isNoCreation())- errorMessages.add("Can not create this tag according to tag protection setting");- } else if (newObjectId.equals(ObjectId.zeroId())) {- if (protection.isNoDeletion())- errorMessages.add("Can not delete this tag according to tag protection setting");- } else if (protection.isNoUpdate()) {- errorMessages.add("Can not update this tag according to tag protection setting");- }- }+ if (oldObjectId.equals(ObjectId.zeroId())) {+ if (protection.isNoCreation())+ errorMessages.add("Can not create this tag according to tag protection setting");+ } else if (newObjectId.equals(ObjectId.zeroId())) {+ if (protection.isNoDeletion())+ errorMessages.add("Can not delete this tag according to tag protection setting");+ } else if (protection.isNoUpdate()) {+ errorMessages.add("Can not update this tag according to tag protection setting");+ }if (errorMessages.isEmpty() && newObjectId.equals(ObjectId.zeroId())) {try {projectManager.onDeleteTag(project, tagName);diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex dfba0e516b..b1ae969a02 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -1313,4 +1313,24 @@ public class DataMigrator {}}+ private void migrate29(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Users.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements())+ element.addElement("webHooks");+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Projects.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ for (Element branchProtectionElement: element.element("branchProtections").elements())+ branchProtectionElement.element("user").setName("userMatch");+ for (Element tagProtectionElement: element.element("tagProtections").elements())+ tagProtectionElement.element("user").setName("userMatch");+ }+ dom.writeToFile(file, false);+ }+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 0d85f49c42..3d9d85964e 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -94,6 +94,7 @@ import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.migration.VersionedDocument;import io.onedev.server.model.Build.Status;import io.onedev.server.model.support.BranchProtection;+import io.onedev.server.model.support.FileProtection;import io.onedev.server.model.support.NamedCodeCommentQuery;import io.onedev.server.model.support.NamedCommitQuery;import io.onedev.server.model.support.ProjectBuildSetting;@@ -110,7 +111,8 @@ import io.onedev.server.util.jackson.DefaultView;import io.onedev.server.util.match.Matcher;import io.onedev.server.util.match.PathMatcher;import io.onedev.server.util.patternset.PatternSet;-import io.onedev.server.util.usermatcher.UserMatcher;+import io.onedev.server.util.reviewrequirement.ReviewRequirement;+import io.onedev.server.util.usermatch.UserMatch;import io.onedev.server.util.validation.annotation.ProjectName;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Markdown;@@ -1118,6 +1120,7 @@ public class Project extends AbstractEntity {return sortedMilestones;}+ @Editablepublic ArrayList<WebHook> getWebHooks() {return webHooks;}@@ -1126,28 +1129,63 @@ public class Project extends AbstractEntity {this.webHooks = webHooks;}- @Nullable+ public List<WebHook> getHierarchyWebHooks() {+ List<WebHook> hierarchyWebHooks = new ArrayList<>(getWebHooks());+ hierarchyWebHooks.addAll(getOwner().getWebHooks());+ return hierarchyWebHooks;+ }+public TagProtection getTagProtection(String tagName, User user) {- for (TagProtection protection: tagProtections) {+ boolean noCreation = false;+ boolean noDeletion = false;+ boolean noUpdate = false;+ for (TagProtection protection: getTagProtections()) {if (protection.isEnabled()- && UserMatcher.fromString(protection.getUser()).matches(this, user)+ && UserMatch.fromString(protection.getUserMatch()).matches(this, user)&& PatternSet.fromString(protection.getTags()).matches(new PathMatcher(), tagName)) {- return protection;+ noCreation = noCreation || protection.isNoCreation();+ noDeletion = noDeletion || protection.isNoDeletion();+ noUpdate = noUpdate || protection.isNoUpdate();}}- return null;++ TagProtection protection = new TagProtection();+ protection.setNoCreation(noCreation);+ protection.setNoDeletion(noDeletion);+ protection.setNoUpdate(noUpdate);++ return protection;}- @Nullablepublic BranchProtection getBranchProtection(String branchName, @Nullable User user) {- for (BranchProtection protection: branchProtections) {+ boolean noCreation = false;+ boolean noDeletion = false;+ boolean noForcedPush = false;+ Set<String> jobNames = new HashSet<>();+ List<FileProtection> fileProtections = new ArrayList<>();+ ReviewRequirement reviewRequirement = ReviewRequirement.fromString(null);+ for (BranchProtection protection: getBranchProtections()) {if (protection.isEnabled()- && UserMatcher.fromString(protection.getUser()).matches(this, user)+ && UserMatch.fromString(protection.getUserMatch()).matches(this, user)&& PatternSet.fromString(protection.getBranches()).matches(new PathMatcher(), branchName)) {- return protection;+ noCreation = noCreation || protection.isNoCreation();+ noDeletion = noDeletion || protection.isNoDeletion();+ noForcedPush = noForcedPush || protection.isNoForcedPush();+ jobNames.addAll(protection.getJobNames());+ fileProtections.addAll(protection.getFileProtections());+ reviewRequirement.mergeWith(protection.getParsedReviewRequirement());}}- return null;++ BranchProtection protection = new BranchProtection();+ protection.setFileProtections(fileProtections);+ protection.setJobNames(new ArrayList<>(jobNames));+ protection.setNoCreation(noCreation);+ protection.setNoDeletion(noDeletion);+ protection.setNoForcedPush(noForcedPush);+ protection.setParsedReviewRequirement(reviewRequirement);++ return protection;}@Override@@ -1305,28 +1343,21 @@ public class Project extends AbstractEntity {}public boolean isReviewRequiredForModification(User user, String branch, @Nullable String file) {- BranchProtection protection = getBranchProtection(branch, user);- if (protection != null)- return protection.isReviewRequiredForModification(user, this, branch, file);- else- return false;+ return getBranchProtection(branch, user).isReviewRequiredForModification(user, this, branch, file);}public boolean isReviewRequiredForPush(User user, String branch, ObjectId oldObjectId,ObjectId newObjectId, Map<String, String> gitEnvs) {- BranchProtection protection = getBranchProtection(branch, user);- return protection != null && protection.isReviewRequiredForPush(user, this, branch, oldObjectId, newObjectId, gitEnvs);+ return getBranchProtection(branch, user).isReviewRequiredForPush(user, this, branch, oldObjectId, newObjectId, gitEnvs);}public boolean isBuildRequiredForModification(User user, String branch, @Nullable String file) {- BranchProtection protection = getBranchProtection(branch, user);- return protection != null && protection.isBuildRequiredForModification(this, branch, file);+ return getBranchProtection(branch, user).isBuildRequiredForModification(this, branch, file);}public boolean isBuildRequiredForPush(User user, String branch, ObjectId oldObjectId, ObjectId newObjectId,Map<String, String> gitEnvs) {- BranchProtection protection = getBranchProtection(branch, user);- return protection != null && protection.isBuildRequiredForPush(this, branch, oldObjectId, newObjectId, gitEnvs);+ return getBranchProtection(branch, user).isBuildRequiredForPush(this, branch, oldObjectId, newObjectId, gitEnvs);}@Nullablediff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java b/server-core/src/main/java/io/onedev/server/model/PullRequestReview.javaindex 102181f59f..5dbee3155e 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java@@ -46,7 +46,7 @@ public class PullRequestReview extends AbstractEntity {@Embeddedprivate ReviewResult result;- private transient Optional<PullRequestUpdate> updateOpt;+ private transient Optional<PullRequestUpdate> updateOptional;public User getUser() {return user;@@ -84,7 +84,7 @@ public class PullRequestReview extends AbstractEntity {@Nullablepublic PullRequestUpdate getUpdate() {- if (updateOpt == null) {+ if (updateOptional == null) {PullRequestUpdate update = null;if (result != null) {MergePreview preview = request.getMergePreview();@@ -99,9 +99,9 @@ public class PullRequestReview extends AbstractEntity {}}}- updateOpt = Optional.ofNullable(update);+ updateOptional = Optional.ofNullable(update);}- return updateOpt.orElse(null);+ return updateOptional.orElse(null);}}diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.javaindex e00cc7bd5e..a0034e5e67 100644--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@ -31,8 +31,9 @@ import com.google.common.base.MoreObjects;import io.onedev.server.model.support.NamedBuildQuery;import io.onedev.server.model.support.NamedProjectQuery;-import io.onedev.server.model.support.UserBuildSetting;import io.onedev.server.model.support.QuerySetting;+import io.onedev.server.model.support.UserBuildSetting;+import io.onedev.server.model.support.WebHook;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;import io.onedev.server.util.SecurityUtils;@@ -157,6 +158,11 @@ public class User extends AbstractEntity implements AuthenticationInfo {@Column(length=65535, nullable=false)private UserBuildSetting buildSetting = new UserBuildSetting();+ @Lob+ @Column(length=65535, nullable=false)+ @JsonView(DefaultView.class)+ private ArrayList<WebHook> webHooks = new ArrayList<>();+private transient Collection<Group> groups;public QuerySetting<NamedProjectQuery> getProjectQuerySetting() {@@ -459,6 +465,14 @@ public class User extends AbstractEntity implements AuthenticationInfo {this.buildSetting = buildSetting;}+ public ArrayList<WebHook> getWebHooks() {+ return webHooks;+ }++ public void setWebHooks(ArrayList<WebHook> webHooks) {+ this.webHooks = webHooks;+ }+@Overridepublic int compareTo(AbstractEntity entity) {User user = (User) entity;diff --git a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.javaindex 3bddbfe67b..edf6401587 100644--- a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java@@ -6,6 +6,7 @@ import java.util.Collection;import java.util.HashSet;import java.util.List;import java.util.Map;+import java.util.Set;import java.util.stream.Collectors;import javax.annotation.Nullable;@@ -26,8 +27,8 @@ import io.onedev.server.util.Usage;import io.onedev.server.util.match.PathMatcher;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.reviewrequirement.ReviewRequirement;-import io.onedev.server.util.usermatcher.Anyone;-import io.onedev.server.util.usermatcher.UserMatcher;+import io.onedev.server.util.usermatch.Anyone;+import io.onedev.server.util.usermatch.UserMatch;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;import io.onedev.server.web.editable.annotation.JobChoice;@@ -45,7 +46,7 @@ public class BranchProtection implements Serializable {private String branches;- private String user = new Anyone().toString();+ private String userMatch = new Anyone().toString();private boolean noForcedPush = true;@@ -55,6 +56,8 @@ public class BranchProtection implements Serializable {private String reviewRequirement;+ private transient ReviewRequirement parsedReviewRequirement;+private List<String> jobNames = new ArrayList<>();private List<FileProtection> fileProtections = new ArrayList<>();@@ -86,12 +89,12 @@ public class BranchProtection implements Serializable {@Editable(order=150, name="Applicable Users", description="Rule will apply only if the user changing the branch matches criteria specified here")@io.onedev.server.web.editable.annotation.UserMatcher@NotEmpty(message="may not be empty")- public String getUser() {- return user;+ public String getUserMatch() {+ return userMatch;}- public void setUser(String user) {- this.user = user;+ public void setUserMatch(String userMatch) {+ this.userMatch = userMatch;}@Editable(order=200, description="Check this to not allow forced push")@@ -122,7 +125,7 @@ public class BranchProtection implements Serializable {}@Editable(order=400, name="Required Reviewers", description="Optionally specify required reviewers for changes of "- + "specified branch. OneDev assumes that the user submitting the change has completed the review already")+ + "specified branch")@io.onedev.server.web.editable.annotation.ReviewRequirement@NameOfEmptyValue("No one")public String getReviewRequirement() {@@ -133,6 +136,17 @@ public class BranchProtection implements Serializable {this.reviewRequirement = reviewRequirement;}+ public ReviewRequirement getParsedReviewRequirement() {+ if (parsedReviewRequirement == null)+ parsedReviewRequirement = ReviewRequirement.fromString(reviewRequirement);+ return parsedReviewRequirement;+ }++ public void setParsedReviewRequirement(ReviewRequirement parsedReviewRequirement) {+ this.parsedReviewRequirement = parsedReviewRequirement;+ reviewRequirement = parsedReviewRequirement.toString();+ }+@Editable(order=500, name="Required Builds", description="Optionally choose required builds")@JobChoice@NameOfEmptyValue("No any")@@ -144,8 +158,7 @@ public class BranchProtection implements Serializable {this.jobNames = jobNames;}- @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 path protection rules")@NotNull(message="may not be empty")@Validpublic List<FileProtection> getFileProtections() {@@ -156,17 +169,23 @@ public class BranchProtection implements Serializable {this.fileProtections = fileProtections;}- @Nullablepublic FileProtection getFileProtection(String file) {+ Set<String> jobNames = new HashSet<>();+ ReviewRequirement reviewRequirement = ReviewRequirement.fromString(null);for (FileProtection protection: fileProtections) {- if (PatternSet.fromString(protection.getPaths()).matches(new PathMatcher(), file))- return protection;+ if (PatternSet.fromString(protection.getPaths()).matches(new PathMatcher(), file)) {+ jobNames.addAll(protection.getJobNames());+ reviewRequirement.mergeWith(protection.getParsedReviewRequirement());+ }}- return null;+ FileProtection protection = new FileProtection();+ protection.setJobNames(new ArrayList<>(jobNames));+ protection.setParsedReviewRequirement(reviewRequirement);+ return protection;}public void onRenameGroup(String oldName, String newName) {- user = UserMatcher.onRenameGroup(user, oldName, newName);+ userMatch = UserMatch.onRenameGroup(userMatch, oldName, newName);reviewRequirement = ReviewRequirement.onRenameGroup(reviewRequirement, oldName, newName);for (FileProtection fileProtection: getFileProtections()) {@@ -177,7 +196,7 @@ public class BranchProtection implements Serializable {public Usage onDeleteGroup(String groupName) {Usage usage = new Usage();- if (UserMatcher.isUsingGroup(user, groupName))+ if (UserMatch.isUsingGroup(userMatch, groupName))usage.add("applicable users");if (ReviewRequirement.isUsingGroup(reviewRequirement, groupName))usage.add("required reviewers");@@ -191,8 +210,8 @@ public class BranchProtection implements Serializable {return usage.prefix("branch protection '" + getBranches() + "'");}- public void onRenameUser(Project project, String oldName, String newName) {- user = UserMatcher.onRenameUser(user, oldName, newName);+ public void onRenameUser(String oldName, String newName) {+ userMatch = UserMatch.onRenameUser(userMatch, oldName, newName);reviewRequirement = ReviewRequirement.onRenameUser(reviewRequirement, oldName, newName);for (FileProtection fileProtection: getFileProtections()) {@@ -203,7 +222,7 @@ public class BranchProtection implements Serializable {public Usage onDeleteUser(String userName) {Usage usage = new Usage();- if (UserMatcher.isUsingUser(user, userName))+ if (UserMatch.isUsingUser(userMatch, userName))usage.add("applicable users");if (ReviewRequirement.isUsingUser(reviewRequirement, userName))usage.add("required reviewers");@@ -230,27 +249,12 @@ public class BranchProtection implements Serializable {* result of the check.*/public boolean isReviewRequiredForModification(User user, Project project, String branch, @Nullable String file) {- if (!ReviewRequirement.fromString(getReviewRequirement()).satisfied(user))- return true;- if (file != null) {- FileProtection fileProtection = getFileProtection(file);- if (fileProtection != null- && !ReviewRequirement.fromString(fileProtection.getReviewRequirement()).satisfied(user)) {- return true;- }- }- return false;+ return !getParsedReviewRequirement().satisfied(user)+ || file != null && !getFileProtection(file).getParsedReviewRequirement().satisfied(user);}public boolean isBuildRequiredForModification(Project project, String branch, @Nullable String file) {- if (!getJobNames().isEmpty())- return true;- if (file != null) {- FileProtection fileProtection = getFileProtection(file);- if (fileProtection != null && !fileProtection.getJobNames().isEmpty())- return true;- }- return false;+ return !getJobNames().isEmpty() || file != null && !getFileProtection(file).getJobNames().isEmpty();}/**@@ -271,15 +275,12 @@ public class BranchProtection implements Serializable {*/public boolean isReviewRequiredForPush(User user, Project project, String branch, ObjectId oldObjectId,ObjectId newObjectId, Map<String, String> gitEnvs) {- if (!ReviewRequirement.fromString(getReviewRequirement()).satisfied(user))+ if (!getParsedReviewRequirement().satisfied(user))return true;for (String changedFile: project.getChangedFiles(oldObjectId, newObjectId, gitEnvs)) {- FileProtection fileProtection = getFileProtection(changedFile);- if (fileProtection != null- && !ReviewRequirement.fromString(fileProtection.getReviewRequirement()).satisfied(user)) {+ if (!getFileProtection(changedFile).getParsedReviewRequirement().satisfied(user))return true;- }}return false;}@@ -287,11 +288,8 @@ public class BranchProtection implements Serializable {public Collection<String> getRequiredJobs(Project project, String branch,ObjectId oldObjectId, ObjectId newObjectId, Map<String, String> gitEnvs) {Collection<String> requiredJobs = new HashSet<>(getJobNames());- for (String changedFile: project.getChangedFiles(oldObjectId, newObjectId, gitEnvs)) {- FileProtection fileProtection = getFileProtection(changedFile);- if (fileProtection != null)- requiredJobs.addAll(fileProtection.getJobNames());- }+ for (String changedFile: project.getChangedFiles(oldObjectId, newObjectId, gitEnvs))+ requiredJobs.addAll(getFileProtection(changedFile).getJobNames());return requiredJobs;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java b/server-core/src/main/java/io/onedev/server/model/support/FileProtection.javaindex f529234719..36f03151d7 100644--- a/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java@@ -10,6 +10,7 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.model.Project;+import io.onedev.server.util.reviewrequirement.ReviewRequirement;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.Editable;@@ -28,10 +29,12 @@ public class FileProtection implements Serializable, Validatable {private String reviewRequirement;+ private transient ReviewRequirement parsedReviewRequirement;+private List<String> jobNames = new ArrayList<>();@Editable(order=100, description="Specify space-separated paths to be protected. Use * or ? for wildcard match")- @Patterns(suggester = "getPathSuggestions")+ @Patterns(suggester = "suggestPaths")@NotEmptypublic String getPaths() {return paths;@@ -42,8 +45,11 @@ public class FileProtection implements Serializable, Validatable {}@SuppressWarnings("unused")- private static List<InputSuggestion> getPathSuggestions(String matchWith) {- return SuggestionUtils.suggestBlobs(Project.get(), matchWith);+ private static List<InputSuggestion> suggestPaths(String matchWith) {+ if (Project.get() != null)+ return SuggestionUtils.suggestBlobs(Project.get(), matchWith);+ else+ return new ArrayList<>();}@Editable(order=200, name="Reviewers", description="Specify required reviewers if specified path is "@@ -57,6 +63,17 @@ public class FileProtection implements Serializable, Validatable {this.reviewRequirement = reviewRequirement;}+ public ReviewRequirement getParsedReviewRequirement() {+ if (parsedReviewRequirement == null)+ parsedReviewRequirement = ReviewRequirement.fromString(reviewRequirement);+ return parsedReviewRequirement;+ }++ public void setParsedReviewRequirement(ReviewRequirement parsedReviewRequirement) {+ this.parsedReviewRequirement = parsedReviewRequirement;+ reviewRequirement = parsedReviewRequirement.toString();+ }+@Editable(order=500, name="Required Builds", description="Optionally choose required builds")@JobChoice@NameOfEmptyValue("No any")diff --git a/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java b/server-core/src/main/java/io/onedev/server/model/support/TagProtection.javaindex c63b60e942..7caaf846ce 100644--- a/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java@@ -9,8 +9,8 @@ import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.model.Project;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;+import io.onedev.server.util.usermatch.Anyone;+import io.onedev.server.util.usermatch.UserMatch;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;import io.onedev.server.web.editable.annotation.Patterns;@@ -26,7 +26,7 @@ public class TagProtection implements Serializable {private String tags;- private String user = new Anyone().toString();+ private String userMatch = new Anyone().toString();private boolean noUpdate = true;@@ -61,12 +61,12 @@ public class TagProtection implements Serializable {@Editable(order=150, name="Applicable Users", description="Rule will apply only if the user changing the tag matches criteria specified here")@io.onedev.server.web.editable.annotation.UserMatcher@NotEmpty(message="may not be empty")- public String getUser() {- return user;+ public String getUserMatch() {+ return userMatch;}- public void setUser(String user) {- this.user = user;+ public void setUserMatch(String userMatch) {+ this.userMatch = userMatch;}@Editable(order=200, description="Check this to not allow tag update")@@ -97,23 +97,23 @@ public class TagProtection implements Serializable {}public void onRenameGroup(String oldName, String newName) {- user = UserMatcher.onRenameGroup(user, oldName, newName);+ userMatch = UserMatch.onRenameGroup(userMatch, oldName, newName);}public Usage onDeleteGroup(String groupName) {Usage usage = new Usage();- if (UserMatcher.isUsingGroup(user, groupName))+ if (UserMatch.isUsingGroup(userMatch, groupName))usage.add("applicable users");return usage.prefix("tag protection '" + getTags() + "'");}public void onRenameUser(String oldName, String newName) {- user = UserMatcher.onRenameUser(user, oldName, newName);+ userMatch = UserMatch.onRenameUser(userMatch, oldName, newName);}public Usage onDeleteUser(String userName) {Usage usage = new Usage();- if (UserMatcher.isUsingUser(user, userName))+ if (UserMatch.isUsingUser(userMatch, userName))usage.add("applicable users");return usage.prefix("tag protection '" + getTags() + "'");}diff --git a/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java b/server-core/src/main/java/io/onedev/server/notification/WebHookManager.javaindex 0ee18a7bfe..37cf251735 100644--- a/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java@@ -55,7 +55,7 @@ public class WebHookManager {} catch (JsonProcessingException e) {throw new RuntimeException(e);}- for (WebHook webHook: event.getProject().getWebHooks()) {+ for (WebHook webHook: event.getProject().getHierarchyWebHooks()) {for (WebHook.EventType eventType: webHook.getEventTypes()) {if (eventType.includes(event)) {executor.submit(new Runnable() {diff --git a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.javaindex abc708d0fa..04c83f6422 100644--- a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java@@ -39,8 +39,6 @@ import io.onedev.server.model.PullRequestComment;import io.onedev.server.model.Role;import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;-import io.onedev.server.model.support.BranchProtection;-import io.onedev.server.model.support.TagProtection;import io.onedev.server.security.permission.AccessBuild;import io.onedev.server.security.permission.AccessBuildLog;import io.onedev.server.security.permission.AccessBuildReports;@@ -107,30 +105,24 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {}public static boolean canDeleteBranch(Project project, String branchName) {- if (canWriteCode(project)) {- BranchProtection protection = project.getBranchProtection(branchName, getUser());- return protection == null || !protection.isNoDeletion();- } else {+ if (canWriteCode(project))+ return !project.getBranchProtection(branchName, getUser()).isNoDeletion();+ elsereturn false;- }}public static boolean canCreateTag(Project project, String tagName) {- if (canWriteCode(project)) {- TagProtection protection = project.getTagProtection(tagName, getUser());- return protection == null || !protection.isNoCreation();- } else {+ if (canWriteCode(project))+ return !project.getTagProtection(tagName, getUser()).isNoCreation();+ elsereturn false;- }}public static boolean canCreateBranch(Project project, String branchName) {- if (canWriteCode(project)) {- BranchProtection protection = project.getBranchProtection(branchName, getUser());- return protection == null || !protection.isNoCreation();- } else {+ if (canWriteCode(project))+ return !project.getBranchProtection(branchName, getUser()).isNoCreation();+ elsereturn false;- }}public static boolean canModify(Project project, String branch, String file) {diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/MentionProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/MentionProcessor.javaindex c564782486..91b4b188c4 100644--- a/server-core/src/main/java/io/onedev/server/util/markdown/MentionProcessor.java+++ b/server-core/src/main/java/io/onedev/server/util/markdown/MentionProcessor.java@@ -5,7 +5,7 @@ import org.jsoup.nodes.Document;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.web.page.admin.user.UserProfilePage;+import io.onedev.server.web.page.admin.user.profile.UserProfilePage;public class MentionProcessor extends MentionParser implements MarkdownProcessor {diff --git a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.javaindex cd171dceed..2f0db24602 100644--- a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java+++ b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java@@ -51,11 +51,10 @@ public class ReviewRequirement {String userName = getValue(criteria.userCriteria().Value());User user = OneDev.getInstance(UserManager.class).findByName(userName);if (user != null) {- if (!users.contains(user)) {+ if (!users.contains(user))users.add(user);- } else {+ elsethrow new OneException("User '" + userName + "' is included multiple times");- }} else {throw new OneException("Unable to find user '" + userName + "'");}@@ -191,4 +190,31 @@ public class ReviewRequirement {elsereturn null;}++ public void mergeWith(ReviewRequirement requirement) {+ for (User user: requirement.getUsers()) {+ if (!users.contains(user))+ users.add(user);+ }+ for (Map.Entry<Group, Integer> entry: requirement.getGroups().entrySet()) {+ Integer count = groups.get(entry.getKey());+ if (count == null || count < entry.getValue())+ groups.put(entry.getKey(), entry.getValue());+ }+ }++ public boolean covers(ReviewRequirement requirement) {+ if (users.containsAll(requirement.getUsers())+ && groups.keySet().containsAll(requirement.getGroups().keySet())) {+ for (Map.Entry<Group, Integer> entry: groups.entrySet()) {+ Integer count = requirement.getGroups().get(entry.getKey());+ if (count != null && count > entry.getValue())+ return false;+ }+ return true;+ } else {+ return false;+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/util/usermatcher/Anyone.java b/server-core/src/main/java/io/onedev/server/util/usermatch/Anyone.javasimilarity index 70%rename from server-core/src/main/java/io/onedev/server/util/usermatcher/Anyone.javarename to server-core/src/main/java/io/onedev/server/util/usermatch/Anyone.javaindex c64e0fb6e1..e2fcce8506 100644--- a/server-core/src/main/java/io/onedev/server/util/usermatcher/Anyone.java+++ b/server-core/src/main/java/io/onedev/server/util/usermatch/Anyone.java@@ -1,9 +1,9 @@-package io.onedev.server.util.usermatcher;+package io.onedev.server.util.usermatch;import io.onedev.server.model.Project;import io.onedev.server.model.User;-public class Anyone implements UserMatcherCriteria {+public class Anyone implements UserMatchCriteria {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/util/usermatcher/SpecifiedGroup.java b/server-core/src/main/java/io/onedev/server/util/usermatch/SpecifiedGroup.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/util/usermatcher/SpecifiedGroup.javarename to server-core/src/main/java/io/onedev/server/util/usermatch/SpecifiedGroup.javaindex dc972d6f76..baf7293c39 100644--- a/server-core/src/main/java/io/onedev/server/util/usermatcher/SpecifiedGroup.java+++ b/server-core/src/main/java/io/onedev/server/util/usermatch/SpecifiedGroup.java@@ -1,4 +1,4 @@-package io.onedev.server.util.usermatcher;+package io.onedev.server.util.usermatch;import com.google.common.base.Preconditions;@@ -9,7 +9,7 @@ import io.onedev.server.model.Group;import io.onedev.server.model.Project;import io.onedev.server.model.User;-public class SpecifiedGroup implements UserMatcherCriteria {+public class SpecifiedGroup implements UserMatchCriteria {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/util/usermatcher/SpecifiedUser.java b/server-core/src/main/java/io/onedev/server/util/usermatch/SpecifiedUser.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/util/usermatcher/SpecifiedUser.javarename to server-core/src/main/java/io/onedev/server/util/usermatch/SpecifiedUser.javaindex 88b526554a..be195c6645 100644--- a/server-core/src/main/java/io/onedev/server/util/usermatcher/SpecifiedUser.java+++ b/server-core/src/main/java/io/onedev/server/util/usermatch/SpecifiedUser.java@@ -1,4 +1,4 @@-package io.onedev.server.util.usermatcher;+package io.onedev.server.util.usermatch;import com.google.common.base.Preconditions;@@ -8,7 +8,7 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.model.User;-public class SpecifiedUser implements UserMatcherCriteria {+public class SpecifiedUser implements UserMatchCriteria {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.g4 b/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.g4similarity index 93%rename from server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.g4rename to server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.g4index 68b4bf3176..2c255690af 100644--- a/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.g4+++ b/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.g4@@ -1,6 +1,6 @@-grammar UserMatcher;+grammar UserMatch;-userMatcher+userMatch: WS* criteria (WS+ OR WS+ criteria)* (WS+ EXCEPT WS+ exceptCriteria (WS+ AND WS+ exceptCriteria)*)? WS* EOF;diff --git a/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java b/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.javasimilarity index 70%rename from server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.javarename to server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.javaindex 1a5391571a..783889640e 100644--- a/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java+++ b/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.java@@ -1,4 +1,4 @@-package io.onedev.server.util.usermatcher;+package io.onedev.server.util.usermatch;import java.io.Serializable;import java.util.ArrayList;@@ -21,44 +21,46 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneException;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.util.usermatcher.UserMatcherParser.CriteriaContext;-import io.onedev.server.util.usermatcher.UserMatcherParser.ExceptCriteriaContext;-import io.onedev.server.util.usermatcher.UserMatcherParser.UserMatcherContext;+import io.onedev.server.util.usermatch.UserMatchLexer;+import io.onedev.server.util.usermatch.UserMatchParser;+import io.onedev.server.util.usermatch.UserMatchParser.CriteriaContext;+import io.onedev.server.util.usermatch.UserMatchParser.ExceptCriteriaContext;+import io.onedev.server.util.usermatch.UserMatchParser.UserMatchContext;-public class UserMatcher implements Serializable {+public class UserMatch implements Serializable {private static final long serialVersionUID = 1L;- private final List<UserMatcherCriteria> criterias;+ private final List<UserMatchCriteria> criterias;- private final List<UserMatcherCriteria> exceptCriterias;+ private final List<UserMatchCriteria> exceptCriterias;- public UserMatcher(List<UserMatcherCriteria> criterias, List<UserMatcherCriteria> exceptCriterias) {+ public UserMatch(List<UserMatchCriteria> criterias, List<UserMatchCriteria> exceptCriterias) {this.criterias = criterias;this.exceptCriterias = exceptCriterias;}- public List<UserMatcherCriteria> getCriterias() {+ public List<UserMatchCriteria> getCriterias() {return criterias;}- public List<UserMatcherCriteria> getExceptCriterias() {+ public List<UserMatchCriteria> getExceptCriterias() {return exceptCriterias;}public boolean matches(Project project, User user) {- for (UserMatcherCriteria criteria: exceptCriterias) {+ for (UserMatchCriteria criteria: exceptCriterias) {if (criteria.matches(project, user))return false;}- for (UserMatcherCriteria criteria: criterias) {+ for (UserMatchCriteria criteria: criterias) {if (criteria.matches(project, user))return true;}return false;}- private static UserMatcherCriteria getUserMatcherCriteria(CriteriaContext criteriaContext) {+ private static UserMatchCriteria getUserMatcherCriteria(CriteriaContext criteriaContext) {if (criteriaContext.Anyone() != null) {return new Anyone();} else if (criteriaContext.userCriteria() != null) {@@ -76,12 +78,12 @@ public class UserMatcher implements Serializable {}}- public static UserMatcher fromString(@Nullable String userMatcherString) {- List<UserMatcherCriteria> criterias = new ArrayList<>();- List<UserMatcherCriteria> exceptCriterias = new ArrayList<>();+ public static UserMatch fromString(@Nullable String userMatcherString) {+ List<UserMatchCriteria> criterias = new ArrayList<>();+ List<UserMatchCriteria> exceptCriterias = new ArrayList<>();if (userMatcherString != null) {- UserMatcherContext userMatcherContext = parse(userMatcherString);+ UserMatchContext userMatcherContext = parse(userMatcherString);for (CriteriaContext criteriaContext: userMatcherContext.criteria())criterias.add(getUserMatcherCriteria(criteriaContext));@@ -91,16 +93,16 @@ public class UserMatcher implements Serializable {}}- return new UserMatcher(criterias, exceptCriterias);+ return new UserMatch(criterias, exceptCriterias);}private static String getValue(TerminalNode terminal) {return StringUtils.unescape(FenceAware.unfence(terminal.getText()));}- public static UserMatcherContext parse(String userMatcherString) {+ public static UserMatchContext parse(String userMatcherString) {CharStream is = CharStreams.fromString(userMatcherString);- UserMatcherLexer lexer = new UserMatcherLexer(is);+ UserMatchLexer lexer = new UserMatchLexer(is);lexer.removeErrorListeners();lexer.addErrorListener(new BaseErrorListener() {@@ -112,10 +114,10 @@ public class UserMatcher implements Serializable {});CommonTokenStream tokens = new CommonTokenStream(lexer);- UserMatcherParser parser = new UserMatcherParser(tokens);+ UserMatchParser parser = new UserMatchParser(tokens);parser.removeErrorListeners();parser.setErrorHandler(new BailErrorStrategy());- return parser.userMatcher();+ return parser.userMatch();}@Override@@ -137,8 +139,8 @@ public class UserMatcher implements Serializable {return new Anyone().toString();}- private static void onRenameGroup(List<UserMatcherCriteria> criterias, String oldName, String newName) {- for (UserMatcherCriteria criteria: criterias) {+ private static void onRenameGroup(List<UserMatchCriteria> criterias, String oldName, String newName) {+ for (UserMatchCriteria criteria: criterias) {if (criteria instanceof SpecifiedGroup) {SpecifiedGroup specifiedGroup = (SpecifiedGroup) criteria;if (specifiedGroup.getGroupName().equals(oldName))@@ -148,14 +150,14 @@ public class UserMatcher implements Serializable {}public static String onRenameGroup(String userMatcherString, String oldName, String newName) {- UserMatcher userMatcher = fromString(userMatcherString);+ UserMatch userMatcher = fromString(userMatcherString);onRenameGroup(userMatcher.getCriterias(), oldName, newName);onRenameGroup(userMatcher.getExceptCriterias(), oldName, newName);return userMatcher.toString();}- private static void onRenameUser(List<UserMatcherCriteria> criterias, String oldName, String newName) {- for (UserMatcherCriteria criteria: criterias) {+ private static void onRenameUser(List<UserMatchCriteria> criterias, String oldName, String newName) {+ for (UserMatchCriteria criteria: criterias) {if (criteria instanceof SpecifiedUser) {SpecifiedUser specifiedUser = (SpecifiedUser) criteria;if (specifiedUser.getUserName().equals(oldName))@@ -165,14 +167,14 @@ public class UserMatcher implements Serializable {}public static String onRenameUser(String userMatcherString, String oldName, String newName) {- UserMatcher userMatcher = fromString(userMatcherString);+ UserMatch userMatcher = fromString(userMatcherString);onRenameUser(userMatcher.getCriterias(), oldName, newName);onRenameUser(userMatcher.getExceptCriterias(), oldName, newName);return userMatcher.toString();}- private static boolean isUsingUser(List<UserMatcherCriteria> criterias, String userName) {- for (UserMatcherCriteria criteria: criterias) {+ private static boolean isUsingUser(List<UserMatchCriteria> criterias, String userName) {+ for (UserMatchCriteria criteria: criterias) {if (criteria instanceof SpecifiedUser) {SpecifiedUser specifiedUser = (SpecifiedUser) criteria;if (specifiedUser.getUserName().equals(userName))@@ -183,13 +185,13 @@ public class UserMatcher implements Serializable {}public static boolean isUsingUser(String userMatcherString, String userName) {- UserMatcher userMatcher = fromString(userMatcherString);+ UserMatch 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) {+ private static boolean isUsingGroup(List<UserMatchCriteria> criterias, String groupName) {+ for (UserMatchCriteria criteria: criterias) {if (criteria instanceof SpecifiedGroup) {SpecifiedGroup specifiedGroup = (SpecifiedGroup) criteria;if (specifiedGroup.getGroupName().equals(groupName))@@ -200,7 +202,7 @@ public class UserMatcher implements Serializable {}public static boolean isUsingGroup(String userMatcherString, String groupName) {- UserMatcher userMatcher = fromString(userMatcherString);+ UserMatch userMatcher = fromString(userMatcherString);return isUsingGroup(userMatcher.getCriterias(), groupName)|| isUsingGroup(userMatcher.getExceptCriterias(), groupName);}diff --git a/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcherCriteria.java b/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatchCriteria.javasimilarity index 65%rename from server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcherCriteria.javarename to server-core/src/main/java/io/onedev/server/util/usermatch/UserMatchCriteria.javaindex a6d273244e..66975442b0 100644--- a/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcherCriteria.java+++ b/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatchCriteria.java@@ -1,4 +1,4 @@-package io.onedev.server.util.usermatcher;+package io.onedev.server.util.usermatch;import java.io.Serializable;@@ -7,7 +7,7 @@ import io.onedev.server.model.User;import io.onedev.server.web.editable.annotation.Editable;@Editable-public interface UserMatcherCriteria extends Serializable {+public interface UserMatchCriteria extends Serializable {boolean matches(Project project, User user);diff --git a/server-core/src/main/java/io/onedev/server/util/validation/UserMatcherValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/UserMatcherValidator.javaindex 7f796659fb..42a162ec4a 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/UserMatcherValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/UserMatcherValidator.java@@ -21,7 +21,7 @@ public class UserMatcherValidator implements ConstraintValidator<UserMatcher, Streturn true;} else {try {- io.onedev.server.util.usermatcher.UserMatcher.parse(value);+ io.onedev.server.util.usermatch.UserMatch.parse(value);return true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex 9392a359ef..09f8e78642 100644--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -16,11 +16,11 @@ import io.onedev.server.web.mapper.OneResourceMapper;import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;-import io.onedev.server.web.page.admin.group.GroupAuthorizationsPage;import io.onedev.server.web.page.admin.group.GroupListPage;-import io.onedev.server.web.page.admin.group.GroupMembershipsPage;-import io.onedev.server.web.page.admin.group.GroupProfilePage;-import io.onedev.server.web.page.admin.group.NewGroupPage;+import io.onedev.server.web.page.admin.group.authorization.GroupAuthorizationsPage;+import io.onedev.server.web.page.admin.group.create.NewGroupPage;+import io.onedev.server.web.page.admin.group.membership.GroupMembershipsPage;+import io.onedev.server.web.page.admin.group.profile.GroupProfilePage;import io.onedev.server.web.page.admin.issuesetting.DefaultBoardListPage;import io.onedev.server.web.page.admin.issuesetting.DefaultStateTransitionsPage;import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;@@ -34,24 +34,25 @@ import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;import io.onedev.server.web.page.admin.serverlog.ServerLogPage;import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;-import io.onedev.server.web.page.admin.user.NewUserPage;-import io.onedev.server.web.page.admin.user.UserAuthorizationsPage;-import io.onedev.server.web.page.admin.user.UserAvatarPage;import io.onedev.server.web.page.admin.user.UserListPage;-import io.onedev.server.web.page.admin.user.UserMembershipsPage;-import io.onedev.server.web.page.admin.user.UserPasswordPage;-import io.onedev.server.web.page.admin.user.UserProfilePage;-import io.onedev.server.web.page.admin.user.UserTokenPage;-import io.onedev.server.web.page.admin.user.buildsetting.UserBuildPreserveRulesPage;-import io.onedev.server.web.page.admin.user.buildsetting.UserSecretListPage;+import io.onedev.server.web.page.admin.user.authorization.UserAuthorizationsPage;+import io.onedev.server.web.page.admin.user.avatar.UserAvatarPage;+import io.onedev.server.web.page.admin.user.buildsetting.UserBuildPreservationsPage;+import io.onedev.server.web.page.admin.user.buildsetting.UserSecretsPage;+import io.onedev.server.web.page.admin.user.create.NewUserPage;+import io.onedev.server.web.page.admin.user.membership.UserMembershipsPage;+import io.onedev.server.web.page.admin.user.password.UserPasswordPage;+import io.onedev.server.web.page.admin.user.profile.UserProfilePage;+import io.onedev.server.web.page.admin.user.webhook.UserWebHooksPage;import io.onedev.server.web.page.build.BuildListPage;import io.onedev.server.web.page.init.ServerInitPage;import io.onedev.server.web.page.issue.IssueListPage;-import io.onedev.server.web.page.my.MyAvatarPage;-import io.onedev.server.web.page.my.MyPasswordPage;-import io.onedev.server.web.page.my.MyProfilePage;-import io.onedev.server.web.page.my.buildsetting.MyBuildPreserveRulesPage;-import io.onedev.server.web.page.my.buildsetting.MySecretListPage;+import io.onedev.server.web.page.my.avatar.MyAvatarPage;+import io.onedev.server.web.page.my.buildsetting.MyBuildPreservationsPage;+import io.onedev.server.web.page.my.buildsetting.MySecretsPage;+import io.onedev.server.web.page.my.password.MyPasswordPage;+import io.onedev.server.web.page.my.profile.MyProfilePage;+import io.onedev.server.web.page.my.webhook.MyWebHooksPage;import io.onedev.server.web.page.project.NewProjectPage;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;@@ -86,14 +87,14 @@ import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullReimport io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePreviewPage;import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;-import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;-import io.onedev.server.web.page.project.setting.build.ProjectBuildPreserveRulesPage;-import io.onedev.server.web.page.project.setting.build.ProjectSecretListPage;+import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionsPage;+import io.onedev.server.web.page.project.setting.build.ProjectBuildPreservationsPage;+import io.onedev.server.web.page.project.setting.build.ProjectSecretsPage;import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;import io.onedev.server.web.page.project.setting.issue.PromptFieldsUponIssueOpenSettingPage;import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;-import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage;-import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;+import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionsPage;+import io.onedev.server.web.page.project.setting.webhook.ProjectWebHooksPage;import io.onedev.server.web.page.project.stats.ProjectContribsPage;import io.onedev.server.web.page.project.stats.SourceLinesPage;import io.onedev.server.web.page.project.tags.ProjectTagsPage;@@ -123,8 +124,9 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("my/profile", MyProfilePage.class));add(new OnePageMapper("my/avatar", MyAvatarPage.class));add(new OnePageMapper("my/password", MyPasswordPage.class));- add(new OnePageMapper("my/build-setting/secrets", MySecretListPage.class));- add(new OnePageMapper("my/build-setting/preserve-rules", MyBuildPreserveRulesPage.class));+ add(new OnePageMapper("my/build-setting/secrets", MySecretsPage.class));+ add(new OnePageMapper("my/build-setting/build-preserve-rules", MyBuildPreservationsPage.class));+ add(new OnePageMapper("my/web-hooks", MyWebHooksPage.class));}private void addResources() {@@ -152,9 +154,9 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("administration/users/${user}/authorizations", UserAuthorizationsPage.class));add(new OnePageMapper("administration/users/${user}/avatar", UserAvatarPage.class));add(new OnePageMapper("administration/users/${user}/password", UserPasswordPage.class));- add(new OnePageMapper("administration/users/${user}/token", UserTokenPage.class));- add(new OnePageMapper("administration/users/${user}/build-setting/secrets", UserSecretListPage.class));- add(new OnePageMapper("administration/users/${user}/build-setting/preserve-rules", UserBuildPreserveRulesPage.class));+ add(new OnePageMapper("administration/users/${user}/build-setting/secrets", UserSecretsPage.class));+ add(new OnePageMapper("administration/users/${user}/build-setting/build-preserve-rules", UserBuildPreservationsPage.class));+ add(new OnePageMapper("administration/users/${user}/web-hooks", UserWebHooksPage.class));add(new OnePageMapper("administration/roles", RoleListPage.class));add(new OnePageMapper("administration/roles/new", NewRolePage.class));@@ -233,14 +235,14 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("projects/${project}/settings/general", GeneralSettingPage.class));add(new OnePageMapper("projects/${project}/settings/authorizations", ProjectAuthorizationsPage.class));add(new OnePageMapper("projects/${project}/settings/avatar-edit", AvatarEditPage.class));- add(new OnePageMapper("projects/${project}/settings/branch-protection", BranchProtectionPage.class));- add(new OnePageMapper("projects/${project}/settings/tag-protection", TagProtectionPage.class));- add(new OnePageMapper("projects/${project}/settings/build/secrets", ProjectSecretListPage.class));- add(new OnePageMapper("projects/${project}/settings/build/preserve-rules", ProjectBuildPreserveRulesPage.class));+ add(new OnePageMapper("projects/${project}/settings/branch-protection", BranchProtectionsPage.class));+ add(new OnePageMapper("projects/${project}/settings/tag-protection", TagProtectionsPage.class));+ add(new OnePageMapper("projects/${project}/settings/build/secrets", ProjectSecretsPage.class));+ add(new OnePageMapper("projects/${project}/settings/build/build-preserve-rules", ProjectBuildPreservationsPage.class));add(new OnePageMapper("projects/${project}/settings/issue/state-transitions", StateTransitionsPage.class));add(new OnePageMapper("projects/${project}/settings/issue/prompt-fields-upon-issue-open",PromptFieldsUponIssueOpenSettingPage.class));- add(new OnePageMapper("projects/${project}/settings/web-hooks", WebHooksPage.class));+ add(new OnePageMapper("projects/${project}/settings/web-hooks", ProjectWebHooksPage.class));}}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/UserMatcherBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/UserMatcherBehavior.javaindex 6221813f45..d7e6b3e570 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/UserMatcherBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/UserMatcherBehavior.java@@ -6,7 +6,7 @@ import io.onedev.commons.codeassist.FenceAware;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;import io.onedev.commons.codeassist.parser.TerminalExpect;-import io.onedev.server.util.usermatcher.UserMatcherParser;+import io.onedev.server.util.usermatch.UserMatchParser;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -14,7 +14,7 @@ import io.onedev.server.web.util.SuggestionUtils;public class UserMatcherBehavior extends ANTLRAssistBehavior {public UserMatcherBehavior() {- super(UserMatcherParser.class, "userMatcher", false);+ super(UserMatchParser.class, "userMatch", false);}@Override@@ -28,9 +28,9 @@ public class UserMatcherBehavior extends ANTLRAssistBehavior {protected List<InputSuggestion> match(String matchWith) {int tokenType = terminalExpect.getState().getLastMatchedToken().getType();switch (tokenType) {- case UserMatcherParser.USER:+ case UserMatchParser.USER:return SuggestionUtils.suggestUsers(matchWith);- case UserMatcherParser.GROUP:+ case UserMatchParser.GROUP:return SuggestionUtils.suggestGroups(matchWith);default:return null;diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.javaindex 491bbd9d01..2874cf220f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java@@ -85,7 +85,7 @@ abstract class CreateBranchPanel extends Panel {User user = Preconditions.checkNotNull(SecurityUtils.getUser());BranchProtection protection = project.getBranchProtection(branchName, user);- if (protection != null && protection.isNoCreation()) {+ if (protection.isNoCreation()) {form.error("Unable to create protected branch");target.focusComponent(nameInput);target.add(form);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html b/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationListPanel.htmlsimilarity index 51%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.htmlrename to server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationListPanel.htmlindex 2988818d8d..5cf949df7f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationListPanel.html@@ -1,9 +1,5 @@-<wicket:extend>- <div class="page-title">Web Hooks</div>- <div class="web-hook list">- <div class="help-block">- OneDev will post event data in JSON format to specified URLs when subscribed events happen- </div>+<wicket:panel>+ <div class="build-preservation-list"><form wicket:id="form" class="leave-confirm"><div wicket:id="feedback"></div><div wicket:id="editor"></div>@@ -12,4 +8,4 @@</div></form></div>-</wicket:extend>\ No newline at end of file+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationListPanel.javanew file mode 100644index 0000000000..c7d4717d8c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationListPanel.java@@ -0,0 +1,46 @@+package io.onedev.server.web.component.build.perservation;++import java.io.Serializable;+import java.util.List;++import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Panel;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.model.support.BuildPreservation;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyEditor;++@SuppressWarnings("serial")+public abstract class BuildPreservationListPanel extends Panel {++ private final BuildPreservationsBean bean;++ public BuildPreservationListPanel(String id, BuildPreservationsBean bean) {+ super(id);+ this.bean = bean;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ PropertyEditor<Serializable> editor = PropertyContext.edit("editor", bean, "buildPreservations");++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();+ getSession().success("Build preserve rules saved");+ onSaved(bean.getBuildPreservations());+ }++ };+ form.add(new NotificationPanel("feedback", form));+ form.add(editor);+ add(form);+ }++ protected abstract void onSaved(List<BuildPreservation> buildPreservations);+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationsBean.java b/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationsBean.javanew file mode 100644index 0000000000..61a13fa076--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationsBean.java@@ -0,0 +1,26 @@+package io.onedev.server.web.component.build.perservation;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import io.onedev.server.model.support.BuildPreservation;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class BuildPreservationsBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<BuildPreservation> buildPreservations = new ArrayList<>();++ @Editable+ public List<BuildPreservation> getBuildPreservations() {+ return buildPreservations;+ }++ public void setBuildPreservations(List<BuildPreservation> buildPreservations) {+ this.buildPreservations = buildPreservations;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.javaindex abd6139ba3..532b3f3048 100644--- a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java@@ -114,7 +114,7 @@ public abstract class CreateTagPanel extends Panel {User user = Preconditions.checkNotNull(SecurityUtils.getUser());TagProtection protection = project.getTagProtection(tagName, user);- if (protection != null && protection.isNoCreation()) {+ if (protection.isNoCreation()) {form.error("Unable to create protected tag");target.focusComponent(nameInput);target.add(form);diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/secret/JobSecretListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/job/secret/JobSecretListPanel.htmlnew file mode 100644index 0000000000..e791e8f3c4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/job/secret/JobSecretListPanel.html@@ -0,0 +1,11 @@+<wicket:panel>+ <div class="job-secret-list">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ <div class="actions">+ <input type="submit" value="Save" class="dirty-aware btn btn-primary">+ </div>+ </form>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/job/secret/JobSecretListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/secret/JobSecretListPanel.javanew file mode 100644index 0000000000..4dc731030f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/job/secret/JobSecretListPanel.java@@ -0,0 +1,58 @@+package io.onedev.server.web.component.job.secret;++import java.io.Serializable;+import java.util.HashSet;+import java.util.List;+import java.util.Set;++import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Panel;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.model.support.JobSecret;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyEditor;++@SuppressWarnings("serial")+public abstract class JobSecretListPanel extends Panel {++ private final JobSecretsBean bean;++ public JobSecretListPanel(String id, JobSecretsBean bean) {+ super(id);+ this.bean = bean;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ PropertyEditor<Serializable> editor = PropertyContext.edit("editor", bean, "secrets");++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ Set<String> names = new HashSet<>();+ for (JobSecret secret: bean.getSecrets()) {+ if (names.contains(secret.getName())) {+ error("Duplicate name found: " + secret.getName());+ return;+ } else {+ names.add(secret.getName());+ }+ }+ getSession().success("Job secrets saved");+ onSaved(bean.getSecrets());+ }++ };+ form.add(new NotificationPanel("feedback", form));+ form.add(editor);+ add(form);+ }++ protected abstract void onSaved(List<JobSecret> secrets);+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/secret/JobSecretsBean.java b/server-core/src/main/java/io/onedev/server/web/component/job/secret/JobSecretsBean.javanew file mode 100644index 0000000000..2d3b65b617--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/job/secret/JobSecretsBean.java@@ -0,0 +1,26 @@+package io.onedev.server.web.component.job.secret;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import io.onedev.server.model.support.JobSecret;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class JobSecretsBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<JobSecret> secrets = new ArrayList<>();++ @Editable+ public List<JobSecret> getSecrets() {+ return secrets;+ }++ public void setSecrets(List<JobSecret> secrets) {+ this.secrets = secrets;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/link/SettingInOwnerLink.java b/server-core/src/main/java/io/onedev/server/web/component/link/SettingInOwnerLink.javanew file mode 100644index 0000000000..7cce4332b7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/link/SettingInOwnerLink.java@@ -0,0 +1,57 @@+package io.onedev.server.web.component.link;++import org.apache.wicket.Page;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.model.IModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.model.Project;+import io.onedev.server.util.SecurityUtils;+import io.onedev.server.web.page.admin.user.UserPage;+import io.onedev.server.web.page.project.ProjectListPage;++public class SettingInOwnerLink extends BookmarkablePageLink<Project> {++ private static final long serialVersionUID = 1L;++ public SettingInOwnerLink(String id, IModel<Project> projectModel, Class<? extends Page> userSettingPageClass,+ Class<? extends Page> mySettingPageClass) {+ super(id, getPageClass(projectModel.getObject(), userSettingPageClass, mySettingPageClass),+ getPageParameters(projectModel.getObject(), userSettingPageClass, mySettingPageClass));+ setModel(projectModel);+ }++ private static Class<? extends Page> getPageClass(Project project, Class<? extends Page> userSettingPageClass,+ Class<? extends Page> mySettingPageClass) {+ if (SecurityUtils.isAdministrator())+ return userSettingPageClass;+ else if (project.getOwner().equals(SecurityUtils.getUser()))+ return mySettingPageClass;+ else+ return ProjectListPage.class;+ }++ private static PageParameters getPageParameters(Project project, Class<? extends Page> userSettingPageClass,+ Class<? extends Page> mySettingPageClass) {+ if (SecurityUtils.isAdministrator())+ return UserPage.paramsOf(project.getOwner());+ else+ return new PageParameters();+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(SecurityUtils.isAdministrator() || getModelObject().getOwner().equals(SecurityUtils.getUser()));+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ onConfigure();+ if (!isEnabled())+ tag.setName("span");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.javaindex 684791fd10..0bf121b1e4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java@@ -18,8 +18,8 @@ import io.onedev.server.web.behavior.dropdown.DropdownHoverBehavior;import io.onedev.server.web.component.floating.AlignPlacement;import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.component.user.card.UserCardPanel;-import io.onedev.server.web.page.admin.user.UserProfilePage;-import io.onedev.server.web.page.my.MyProfilePage;+import io.onedev.server.web.page.admin.user.profile.UserProfilePage;+import io.onedev.server.web.page.my.profile.MyProfilePage;@SuppressWarnings("serial")public class UserIdentPanel extends Panel {diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.javaindex 9227348b08..cdd6468c21 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.java@@ -10,7 +10,7 @@ import org.apache.wicket.markup.repeater.RepeatingView;import io.onedev.server.model.User;import io.onedev.server.web.component.user.avatar.UserAvatar;-import io.onedev.server.web.page.admin.user.UserProfilePage;+import io.onedev.server.web.page.admin.user.profile.UserProfilePage;@SuppressWarnings("serial")abstract class SimpleUserListPanel extends Panel {diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGenerateBean.java b/server-core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGenerateBean.javadeleted file mode 100644index 9bc6f76a09..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGenerateBean.java+++ /dev/null@@ -1,30 +0,0 @@-package io.onedev.server.web.component.user.tokengenerate;--import java.io.Serializable;--import org.hibernate.validator.constraints.NotEmpty;--import io.onedev.server.util.validation.annotation.CurrentPassword;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.Password;--@Editable-public class TokenGenerateBean implements Serializable {-- private static final long serialVersionUID = 1L;-- private String password;-- @Editable(order=100, description="Input password of this user")- @CurrentPassword- @Password- @NotEmpty- public String getPassword() {- return password;- }-- public void setPassword(String password) {- this.password = password;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGenerateCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGenerateCssResourceReference.javadeleted file mode 100644index 2f3bf3d65d..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGenerateCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.component.user.tokengenerate;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class TokenGenerateCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public TokenGenerateCssResourceReference() {- super(TokenGenerateCssResourceReference.class, "token-generate.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGeneratePanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGeneratePanel.htmldeleted file mode 100644index d6a1b552d0..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGeneratePanel.html+++ /dev/null@@ -1,19 +0,0 @@-<wicket:panel>- <div class="token-generate">- <div class="body">- <div class="alert alert-info">Access token can be used to provide access to OneDev in some third-party- applications not supporting http basic authentication</div>- <form wicket:id="form" class="leave-confirm" autocomplete="off">- <div wicket:id="editor"></div>- <div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Display">- </div>- </form>- <wicket:enclosure child="token">- <div class="token-value">- <b>Access Token:</b> <span wicket:id="token"></span> <a wicket:id="copy"><i class="fa fa-clipboard"></i></a>- </div>- </wicket:enclosure>- </div>- </div>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGeneratePanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGeneratePanel.javadeleted file mode 100644index a1e2e03b67..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGeneratePanel.java+++ /dev/null@@ -1,97 +0,0 @@-package io.onedev.server.web.component.user.tokengenerate;--import org.apache.shiro.SecurityUtils;-import org.apache.shiro.codec.Base64;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.IFormSubmitter;-import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;--import io.onedev.server.model.User;-import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;-import io.onedev.server.web.editable.BeanContext;--@SuppressWarnings("serial")-public class TokenGeneratePanel extends GenericPanel<User> {-- private String token;-- public TokenGeneratePanel(String id, IModel<User> model) {- super(id, model);- }-- private User getUser() {- return getModelObject();- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TokenGenerateBean bean = new TokenGenerateBean();-- Form<?> form = new Form<Void>("form") {-- @Override- public void process(IFormSubmitter submittingComponent) {- SecurityUtils.getSubject().runAs(getUser().getPrincipals());- try {- super.process(submittingComponent);- } finally {- SecurityUtils.getSubject().releaseRunAs();- }- }-- @Override- protected void onSubmit() {- super.onSubmit();-- token = new String(Base64.encode((getUser().getName() + ":" + bean.getPassword()).getBytes()));-- bean.setPassword(null);- replace(BeanContext.edit("editor", bean));- }-- };- add(form);-- form.add(BeanContext.edit("editor", bean));-- add(new Label("token", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return token;- }-- }) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(token != null);- }-- });- add(new WebMarkupContainer("copy").add(new CopyClipboardBehavior(new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return token;- }-- })));- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new TokenGenerateCssResourceReference()));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/tokengenerate/token-generate.css b/server-core/src/main/java/io/onedev/server/web/component/user/tokengenerate/token-generate.cssdeleted file mode 100644index d9d3343422..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/user/tokengenerate/token-generate.css+++ /dev/null@@ -1,6 +0,0 @@-.token-generate .token-value {- margin-top: 20px;-}-.token-generate .token-value a {- margin-left: 4px;-}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHookListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHookListCssResourceReference.javanew file mode 100644index 0000000000..584d6cef26--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHookListCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.webhook;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class WebHookListCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public WebHookListCssResourceReference() {+ super(WebHookListCssResourceReference.class, "web-hook-list.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHookListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHookListPanel.htmlnew file mode 100644index 0000000000..3b5196d43f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHookListPanel.html@@ -0,0 +1,11 @@+<wicket:panel>+ <div class="web-hook-list">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ <div class="actions">+ <input type="submit" value="Save" class="dirty-aware btn btn-primary">+ </div>+ </form>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.java b/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHookListPanel.javasimilarity index 57%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.javarename to server-core/src/main/java/io/onedev/server/web/component/webhook/WebHookListPanel.javaindex 2f6ba02004..8ef512e3ca 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.java+++ b/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHookListPanel.java@@ -1,41 +1,41 @@-package io.onedev.server.web.page.project.setting.webhook;+package io.onedev.server.web.component.webhook;import java.io.Serializable;+import java.util.ArrayList;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.apache.wicket.markup.html.panel.Panel;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.support.WebHook;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.page.project.setting.ProjectSettingPage;@SuppressWarnings("serial")-public class WebHooksPage extends ProjectSettingPage {+public abstract class WebHookListPanel extends Panel {- public WebHooksPage(PageParameters params) {- super(params);+ private final WebHooksBean bean;++ public WebHookListPanel(String id, WebHooksBean bean) {+ super(id);+ this.bean = bean;}@Overrideprotected void onInitialize() {super.onInitialize();-- WebHooksEditBean bean = new WebHooksEditBean();- bean.setWebHooks(getProject().getWebHooks());+PropertyEditor<Serializable> editor = PropertyContext.edit("editor", bean, "webHooks");+Form<?> form = new Form<Void>("form") {@Overrideprotected void onSubmit() {super.onSubmit();- getProject().setWebHooks(bean.getWebHooks());- OneDev.getInstance(ProjectManager.class).save(getProject());getSession().success("Web hooks saved");+ onSaved(bean.getWebHooks());}};@@ -47,7 +47,8 @@ public class WebHooksPage extends ProjectSettingPage {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new WebHookCssResourceReference()));+ response.render(CssHeaderItem.forReference(new WebHookListCssResourceReference()));}+ protected abstract void onSaved(ArrayList<WebHook> webHooks);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksEditBean.java b/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHooksBean.javasimilarity index 79%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksEditBean.javarename to server-core/src/main/java/io/onedev/server/web/component/webhook/WebHooksBean.javaindex b36f38e40f..7e66eb5ab9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHooksBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.setting.webhook;+package io.onedev.server.web.component.webhook;import java.io.Serializable;import java.util.ArrayList;@@ -7,10 +7,10 @@ import io.onedev.server.model.support.WebHook;import io.onedev.server.web.editable.annotation.Editable;@Editable-public class WebHooksEditBean implements Serializable {+public class WebHooksBean implements Serializable {private static final long serialVersionUID = 1L;-+private ArrayList<WebHook> webHooks = new ArrayList<>();@Editablediff --git a/server-core/src/main/java/io/onedev/server/web/component/webhook/web-hook-list.css b/server-core/src/main/java/io/onedev/server/web/component/webhook/web-hook-list.cssnew file mode 100644index 0000000000..8d57af95bf--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/webhook/web-hook-list.css@@ -0,0 +1,9 @@+.web-hook-list table thead th {+ font-weight: bold !important;+}+.web-hook-list table thead th.property-eventTypes {+ width: 25%;+}+.web-hook-list table .select2-container {+ width: 100%;+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeEditPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeEditPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeEditPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeEditPanel.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeEditPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeEditPanel.javaindex 87cfd7e97d..194908bcc1 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeEditPanel.java@@ -17,13 +17,13 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;@SuppressWarnings("serial")-abstract class PrivilegeEditPanel extends Panel {+abstract class JobPrivilegeEditPanel extends Panel {private final List<JobPrivilege> privileges;private final int privilegeIndex;- public PrivilegeEditPanel(String id, List<JobPrivilege> privileges, int privilegeIndex) {+ public JobPrivilegeEditPanel(String id, List<JobPrivilege> privileges, int privilegeIndex) {super(id);this.privileges = privileges;@@ -57,7 +57,7 @@ abstract class PrivilegeEditPanel extends Panel {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(PrivilegeEditPanel.this));+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobPrivilegeEditPanel.this));}@Override@@ -93,7 +93,7 @@ abstract class PrivilegeEditPanel extends Panel {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(PrivilegeEditPanel.this));+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobPrivilegeEditPanel.this));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.javaindex eed6f772ff..0cfc4074cc 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.java@@ -34,11 +34,11 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyUpdating;@SuppressWarnings("serial")-class PrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {+class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {private final List<JobPrivilege> privileges;- public PrivilegeListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {+ public JobPrivilegeListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {super(id, propertyDescriptor, model);privileges = new ArrayList<>();@@ -54,7 +54,7 @@ class PrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {@Overrideprotected Component newContent(String id, ModalPanel modal) {- return new PrivilegeEditPanel(id, privileges, -1) {+ return new JobPrivilegeEditPanel(id, privileges, -1) {@Overrideprotected void onCancel(AjaxRequestTarget target) {@@ -66,7 +66,7 @@ class PrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {markFormDirty(target);modal.close();onPropertyUpdating(target);- target.add(PrivilegeListEditPanel.this);+ target.add(JobPrivilegeListEditPanel.this);}};@@ -102,12 +102,12 @@ class PrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {@Overridepublic void populateItem(Item<ICellPopulator<JobPrivilege>> cellItem, String componentId, IModel<JobPrivilege> rowModel) {- Fragment fragment = new Fragment(componentId, "actionColumnFrag", PrivilegeListEditPanel.this);+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", JobPrivilegeListEditPanel.this);fragment.add(new ModalLink("edit") {@Overrideprotected Component newContent(String id, ModalPanel modal) {- return new PrivilegeEditPanel(id, privileges, cellItem.findParent(Item.class).getIndex()) {+ return new JobPrivilegeEditPanel(id, privileges, cellItem.findParent(Item.class).getIndex()) {@Overrideprotected void onCancel(AjaxRequestTarget target) {@@ -119,7 +119,7 @@ class PrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {markFormDirty(target);modal.close();onPropertyUpdating(target);- target.add(PrivilegeListEditPanel.this);+ target.add(JobPrivilegeListEditPanel.this);}};@@ -133,7 +133,7 @@ class PrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {markFormDirty(target);privileges.remove(rowModel.getObject());onPropertyUpdating(target);- target.add(PrivilegeListEditPanel.this);+ target.add(JobPrivilegeListEditPanel.this);}});@@ -175,7 +175,7 @@ class PrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {Collections.swap(privileges, fromIndex-i, fromIndex-i-1);}onPropertyUpdating(target);- target.add(PrivilegeListEditPanel.this);+ target.add(JobPrivilegeListEditPanel.this);}}.sortable("tbody"));diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditSupport.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditSupport.javaindex 545cd1d8df..a20e86ef6d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditSupport.java@@ -16,7 +16,7 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyViewer;@SuppressWarnings("serial")-public class PrivilegeListEditSupport implements EditSupport {+public class JobPrivilegeListEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {@@ -32,7 +32,7 @@ public class PrivilegeListEditSupport implements EditSupport {@Overrideprotected Component newContent(String componentId, PropertyDescriptor propertyDescriptor) {if (model.getObject() != null)- return new PrivilegeListViewPanel(componentId, model.getObject());+ return new JobPrivilegeListViewPanel(componentId, model.getObject());elsereturn new EmptyValueLabel(componentId, propertyDescriptor.getPropertyGetter());}@@ -42,7 +42,7 @@ public class PrivilegeListEditSupport implements EditSupport {@Overridepublic PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {- return new PrivilegeListEditPanel(componentId, descriptor, model);+ return new JobPrivilegeListEditPanel(componentId, descriptor, model);}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListViewPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListViewPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListViewPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListViewPanel.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListViewPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListViewPanel.javaindex b4c720a36b..d078938c06 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListViewPanel.java@@ -29,11 +29,11 @@ import io.onedev.server.web.page.layout.SideFloating;import io.onedev.server.web.page.layout.SideFloating.Placement;@SuppressWarnings("serial")-class PrivilegeListViewPanel extends Panel {+class JobPrivilegeListViewPanel extends Panel {private final List<JobPrivilege> privileges = new ArrayList<>();- public PrivilegeListViewPanel(String id, List<Serializable> elements) {+ public JobPrivilegeListViewPanel(String id, List<Serializable> elements) {super(id);for (Serializable each: elements)@@ -108,7 +108,7 @@ class PrivilegeListViewPanel extends Panel {private final int index;public ColumnFragment(String id, int index) {- super(id, "columnFrag", PrivilegeListViewPanel.this);+ super(id, "columnFrag", JobPrivilegeListViewPanel.this);this.index = index;}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeCssResourceReference.javadeleted file mode 100644index 51f67d91f9..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.editable.job.privilege;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class PrivilegeCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public PrivilegeCssResourceReference() {- super(PrivilegeCssResourceReference.class, "privilege.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/privilege.css b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/privilege.cssdeleted file mode 100644index e69de29bb2..0000000000diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportBean.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportBean.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportBean.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportBean.javaindex 58c2a97ccc..c519b607eb 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportBean.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportBean.java@@ -8,7 +8,7 @@ import io.onedev.server.buildspec.job.JobReport;import io.onedev.server.web.editable.annotation.Editable;@Editable-public class ReportBean implements Serializable {+public class JobReportBean implements Serializable {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportEditPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportEditPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportEditPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportEditPanel.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportEditPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportEditPanel.javaindex 4e98168a4a..235b0418e3 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportEditPanel.java@@ -18,13 +18,13 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;@SuppressWarnings("serial")-abstract class ReportEditPanel extends Panel implements BuildSpecAware, JobAware {+abstract class JobReportEditPanel extends Panel implements BuildSpecAware, JobAware {private final List<JobReport> reports;private final int reportIndex;- public ReportEditPanel(String id, List<JobReport> reports, int reportIndex) {+ public JobReportEditPanel(String id, List<JobReport> reports, int reportIndex) {super(id);this.reports = reports;@@ -35,7 +35,7 @@ abstract class ReportEditPanel extends Panel implements BuildSpecAware, JobAwareprotected void onInitialize() {super.onInitialize();- ReportBean bean = new ReportBean();+ JobReportBean bean = new JobReportBean();if (reportIndex != -1)bean.setReport(reports.get(reportIndex));@@ -54,7 +54,7 @@ abstract class ReportEditPanel extends Panel implements BuildSpecAware, JobAware@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ReportEditPanel.this));+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobReportEditPanel.this));}@Override@@ -92,7 +92,7 @@ abstract class ReportEditPanel extends Panel implements BuildSpecAware, JobAware@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ReportEditPanel.this));+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobReportEditPanel.this));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.javaindex 17262c53b4..3e5605e72e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.java@@ -39,11 +39,11 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyUpdating;@SuppressWarnings("serial")-class ReportListEditPanel extends PropertyEditor<List<Serializable>> {+class JobReportListEditPanel extends PropertyEditor<List<Serializable>> {private final List<JobReport> reports;- public ReportListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {+ public JobReportListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {super(id, propertyDescriptor, model);reports = new ArrayList<>();@@ -58,7 +58,7 @@ class ReportListEditPanel extends PropertyEditor<List<Serializable>> {@Overrideprotected Component newContent(String id, ModalPanel modal) {- return new ReportEditPanel(id, reports, -1) {+ return new JobReportEditPanel(id, reports, -1) {@Overrideprotected void onCancel(AjaxRequestTarget target) {@@ -70,17 +70,17 @@ class ReportListEditPanel extends PropertyEditor<List<Serializable>> {markFormDirty(target);modal.close();onPropertyUpdating(target);- target.add(ReportListEditPanel.this);+ target.add(JobReportListEditPanel.this);}@Overridepublic BuildSpec getBuildSpec() {- return ReportListEditPanel.this.getBuildSpec();+ return JobReportListEditPanel.this.getBuildSpec();}@Overridepublic Job getJob() {- return ReportListEditPanel.this.getJob();+ return JobReportListEditPanel.this.getJob();}};@@ -124,12 +124,12 @@ class ReportListEditPanel extends PropertyEditor<List<Serializable>> {@Overridepublic void populateItem(Item<ICellPopulator<JobReport>> cellItem, String componentId, IModel<JobReport> rowModel) {- Fragment fragment = new Fragment(componentId, "actionColumnFrag", ReportListEditPanel.this);+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", JobReportListEditPanel.this);fragment.add(new ModalLink("edit") {@Overrideprotected Component newContent(String id, ModalPanel modal) {- return new ReportEditPanel(id, reports, cellItem.findParent(Item.class).getIndex()) {+ return new JobReportEditPanel(id, reports, cellItem.findParent(Item.class).getIndex()) {@Overrideprotected void onCancel(AjaxRequestTarget target) {@@ -141,17 +141,17 @@ class ReportListEditPanel extends PropertyEditor<List<Serializable>> {markFormDirty(target);modal.close();onPropertyUpdating(target);- target.add(ReportListEditPanel.this);+ target.add(JobReportListEditPanel.this);}@Overridepublic BuildSpec getBuildSpec() {- return ReportListEditPanel.this.getBuildSpec();+ return JobReportListEditPanel.this.getBuildSpec();}@Overridepublic Job getJob() {- return ReportListEditPanel.this.getJob();+ return JobReportListEditPanel.this.getJob();}};@@ -165,7 +165,7 @@ class ReportListEditPanel extends PropertyEditor<List<Serializable>> {markFormDirty(target);reports.remove(rowModel.getObject());onPropertyUpdating(target);- target.add(ReportListEditPanel.this);+ target.add(JobReportListEditPanel.this);}});@@ -207,7 +207,7 @@ class ReportListEditPanel extends PropertyEditor<List<Serializable>> {Collections.swap(reports, fromIndex-i, fromIndex-i-1);}onPropertyUpdating(target);- target.add(ReportListEditPanel.this);+ target.add(JobReportListEditPanel.this);}}.sortable("tbody"));diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditSupport.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditSupport.javaindex 2f3266c67b..5568d075eb 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditSupport.java@@ -16,7 +16,7 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyViewer;@SuppressWarnings("serial")-public class ReportListEditSupport implements EditSupport {+public class JobReportListEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {@@ -32,7 +32,7 @@ public class ReportListEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {if (model.getObject() != null) {- return new ReportListViewPanel(id, model.getObject());+ return new JobReportListViewPanel(id, model.getObject());} else {return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}@@ -43,7 +43,7 @@ public class ReportListEditSupport implements EditSupport {@Overridepublic PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {- return new ReportListEditPanel(componentId, descriptor, model);+ return new JobReportListEditPanel(componentId, descriptor, model);}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListViewPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListViewPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.javaindex 45c9cb549b..3bad6e5cca 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.java@@ -29,11 +29,11 @@ import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.layout.SideFloating;@SuppressWarnings("serial")-class ReportListViewPanel extends Panel {+class JobReportListViewPanel extends Panel {private final List<JobReport> reports = new ArrayList<>();- public ReportListViewPanel(String id, List<Serializable> elements) {+ public JobReportListViewPanel(String id, List<Serializable> elements) {super(id);for (Serializable each: elements)@@ -124,7 +124,7 @@ class ReportListViewPanel extends Panel {private final int index;public ColumnFragment(String id, int index) {- super(id, "columnFrag", ReportListViewPanel.this);+ super(id, "columnFrag", JobReportListViewPanel.this);this.index = index;}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceCssResourceReference.javanew file mode 100644index 0000000000..733b2ad746--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.editable.job.service;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class JobServiceCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public JobServiceCssResourceReference() {+ super(JobServiceCssResourceReference.class, "job-service.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceEditPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceEditPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceEditPanel.javasimilarity index 90%rename from server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceEditPanel.javaindex 1d4c1d6ab8..34bc4a284c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceEditPanel.java@@ -21,13 +21,13 @@ import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.editable.Path;@SuppressWarnings("serial")-abstract class ServiceEditPanel extends Panel implements BuildSpecAware, JobAware {+abstract class JobServiceEditPanel extends Panel implements BuildSpecAware, JobAware {private final List<JobService> services;private final int serviceIndex;- public ServiceEditPanel(String id, List<JobService> services, int serviceIndex) {+ public JobServiceEditPanel(String id, List<JobService> services, int serviceIndex) {super(id);this.services = services;@@ -61,7 +61,7 @@ abstract class ServiceEditPanel extends Panel implements BuildSpecAware, JobAwar@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ServiceEditPanel.this));+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobServiceEditPanel.this));}@Override@@ -109,7 +109,7 @@ abstract class ServiceEditPanel extends Panel implements BuildSpecAware, JobAwar@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ServiceEditPanel.this));+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobServiceEditPanel.this));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.javaindex 830e45cc5b..e40558c1fc 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.java@@ -40,11 +40,11 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyUpdating;@SuppressWarnings("serial")-class ServiceListEditPanel extends PropertyEditor<List<Serializable>> {+class JobServiceListEditPanel extends PropertyEditor<List<Serializable>> {private final List<JobService> services;- public ServiceListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {+ public JobServiceListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {super(id, propertyDescriptor, model);services = new ArrayList<>();@@ -76,7 +76,7 @@ class ServiceListEditPanel extends PropertyEditor<List<Serializable>> {@Overrideprotected Component newContent(String id, ModalPanel modal) {- return new ServiceEditPanel(id, services, -1) {+ return new JobServiceEditPanel(id, services, -1) {@Overrideprotected void onCancel(AjaxRequestTarget target) {@@ -88,17 +88,17 @@ class ServiceListEditPanel extends PropertyEditor<List<Serializable>> {markFormDirty(target);modal.close();onPropertyUpdating(target);- target.add(ServiceListEditPanel.this);+ target.add(JobServiceListEditPanel.this);}@Overridepublic BuildSpec getBuildSpec() {- return ServiceListEditPanel.this.getBuildSpec();+ return JobServiceListEditPanel.this.getBuildSpec();}@Overridepublic Job getJob() {- return ServiceListEditPanel.this.getJob();+ return JobServiceListEditPanel.this.getJob();}};@@ -143,12 +143,12 @@ class ServiceListEditPanel extends PropertyEditor<List<Serializable>> {@Overridepublic void populateItem(Item<ICellPopulator<JobService>> cellItem, String componentId, IModel<JobService> rowModel) {- Fragment fragment = new Fragment(componentId, "actionColumnFrag", ServiceListEditPanel.this);+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", JobServiceListEditPanel.this);fragment.add(new ModalLink("edit") {@Overrideprotected Component newContent(String id, ModalPanel modal) {- return new ServiceEditPanel(id, services, cellItem.findParent(Item.class).getIndex()) {+ return new JobServiceEditPanel(id, services, cellItem.findParent(Item.class).getIndex()) {@Overrideprotected void onCancel(AjaxRequestTarget target) {@@ -160,17 +160,17 @@ class ServiceListEditPanel extends PropertyEditor<List<Serializable>> {markFormDirty(target);modal.close();onPropertyUpdating(target);- target.add(ServiceListEditPanel.this);+ target.add(JobServiceListEditPanel.this);}@Overridepublic BuildSpec getBuildSpec() {- return ServiceListEditPanel.this.getBuildSpec();+ return JobServiceListEditPanel.this.getBuildSpec();}@Overridepublic Job getJob() {- return ServiceListEditPanel.this.getJob();+ return JobServiceListEditPanel.this.getJob();}};@@ -184,7 +184,7 @@ class ServiceListEditPanel extends PropertyEditor<List<Serializable>> {markFormDirty(target);services.remove(rowModel.getObject());onPropertyUpdating(target);- target.add(ServiceListEditPanel.this);+ target.add(JobServiceListEditPanel.this);}});@@ -226,7 +226,7 @@ class ServiceListEditPanel extends PropertyEditor<List<Serializable>> {Collections.swap(services, fromIndex-i, fromIndex-i-1);}onPropertyUpdating(target);- target.add(ServiceListEditPanel.this);+ target.add(JobServiceListEditPanel.this);}}.sortable("tbody"));@@ -253,7 +253,7 @@ class ServiceListEditPanel extends PropertyEditor<List<Serializable>> {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new ServiceCssResourceReference()));+ response.render(CssHeaderItem.forReference(new JobServiceCssResourceReference()));}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditSupport.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditSupport.javaindex a1507fb313..40bd7102d5 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditSupport.java@@ -16,7 +16,7 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyViewer;@SuppressWarnings("serial")-public class ServiceListEditSupport implements EditSupport {+public class JobServiceListEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {@@ -32,7 +32,7 @@ public class ServiceListEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {if (model.getObject() != null)- return new ServiceListViewPanel(id, model.getObject());+ return new JobServiceListViewPanel(id, model.getObject());elsereturn new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}@@ -42,7 +42,7 @@ public class ServiceListEditSupport implements EditSupport {@Overridepublic PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {- return new ServiceListEditPanel(componentId, descriptor, model);+ return new JobServiceListEditPanel(componentId, descriptor, model);}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListViewPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListViewPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListViewPanel.javasimilarity index 91%rename from server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListViewPanel.javaindex 0a5ab0a597..02d9aeb6ca 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListViewPanel.java@@ -31,11 +31,11 @@ import io.onedev.server.web.page.layout.SideFloating;import io.onedev.server.web.page.layout.SideFloating.Placement;@SuppressWarnings("serial")-class ServiceListViewPanel extends Panel {+class JobServiceListViewPanel extends Panel {private final List<JobService> services = new ArrayList<>();- public ServiceListViewPanel(String id, List<Serializable> elements) {+ public JobServiceListViewPanel(String id, List<Serializable> elements) {super(id);for (Serializable each: elements)@@ -123,7 +123,7 @@ class ServiceListViewPanel extends Panel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new ServiceCssResourceReference()));+ response.render(CssHeaderItem.forReference(new JobServiceCssResourceReference()));}private abstract class ColumnFragment extends Fragment {@@ -131,7 +131,7 @@ class ServiceListViewPanel extends Panel {private final int index;public ColumnFragment(String id, int index) {- super(id, "columnFrag", ServiceListViewPanel.this);+ super(id, "columnFrag", JobServiceListViewPanel.this);this.index = index;}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceCssResourceReference.javadeleted file mode 100644index bc388b3337..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.editable.job.service;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class ServiceCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public ServiceCssResourceReference() {- super(ServiceCssResourceReference.class, "service.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/service.css b/server-core/src/main/java/io/onedev/server/web/editable/job/service/job-service.csssimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/job/service/service.cssrename to server-core/src/main/java/io/onedev/server/web/editable/job/service/job-service.cssdiff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerBean.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerBean.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerBean.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerBean.javaindex 3f9449f20d..9d0c5fb852 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerBean.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerBean.java@@ -8,7 +8,7 @@ import io.onedev.server.buildspec.job.trigger.JobTrigger;import io.onedev.server.web.editable.annotation.Editable;@Editable-public class TriggerBean implements Serializable {+public class JobTriggerBean implements Serializable {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerCssResourceReference.javanew file mode 100644index 0000000000..bd271a0c77--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.editable.job.trigger;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class JobTriggerCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public JobTriggerCssResourceReference() {+ super(JobTriggerCssResourceReference.class, "job-trigger.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerEditPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerEditPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerEditPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerEditPanel.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerEditPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerEditPanel.javaindex f350ee2a4a..eb2e5a294b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerEditPanel.java@@ -17,13 +17,13 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;@SuppressWarnings("serial")-abstract class TriggerEditPanel extends Panel implements JobAware {+abstract class JobTriggerEditPanel extends Panel implements JobAware {private final List<JobTrigger> triggers;private final int triggerIndex;- public TriggerEditPanel(String id, List<JobTrigger> triggers, int triggerIndex) {+ public JobTriggerEditPanel(String id, List<JobTrigger> triggers, int triggerIndex) {super(id);this.triggers = triggers;@@ -34,7 +34,7 @@ abstract class TriggerEditPanel extends Panel implements JobAware {protected void onInitialize() {super.onInitialize();- TriggerBean bean = new TriggerBean();+ JobTriggerBean bean = new JobTriggerBean();if (triggerIndex != -1)bean.setTrigger(triggers.get(triggerIndex));@@ -53,7 +53,7 @@ abstract class TriggerEditPanel extends Panel implements JobAware {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(TriggerEditPanel.this));+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobTriggerEditPanel.this));}@Override@@ -91,7 +91,7 @@ abstract class TriggerEditPanel extends Panel implements JobAware {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(TriggerEditPanel.this));+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobTriggerEditPanel.this));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.javaindex 65889e67b0..e60eec8902 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.java@@ -38,11 +38,11 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyUpdating;@SuppressWarnings("serial")-class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {+class JobTriggerListEditPanel extends PropertyEditor<List<Serializable>> {private final List<JobTrigger> triggers;- public TriggerListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {+ public JobTriggerListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {super(id, propertyDescriptor, model);triggers = new ArrayList<>();@@ -66,7 +66,7 @@ class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {@Overrideprotected Component newContent(String id, ModalPanel modal) {- return new TriggerEditPanel(id, triggers, -1) {+ return new JobTriggerEditPanel(id, triggers, -1) {@Overrideprotected void onCancel(AjaxRequestTarget target) {@@ -78,12 +78,12 @@ class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {markFormDirty(target);modal.close();onPropertyUpdating(target);- target.add(TriggerListEditPanel.this);+ target.add(JobTriggerListEditPanel.this);}@Overridepublic Job getJob() {- return TriggerListEditPanel.this.getJob();+ return JobTriggerListEditPanel.this.getJob();}};@@ -128,12 +128,12 @@ class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {@Overridepublic void populateItem(Item<ICellPopulator<JobTrigger>> cellItem, String componentId, IModel<JobTrigger> rowModel) {- Fragment fragment = new Fragment(componentId, "actionColumnFrag", TriggerListEditPanel.this);+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", JobTriggerListEditPanel.this);fragment.add(new ModalLink("edit") {@Overrideprotected Component newContent(String id, ModalPanel modal) {- return new TriggerEditPanel(id, triggers, cellItem.findParent(Item.class).getIndex()) {+ return new JobTriggerEditPanel(id, triggers, cellItem.findParent(Item.class).getIndex()) {@Overrideprotected void onCancel(AjaxRequestTarget target) {@@ -145,12 +145,12 @@ class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {markFormDirty(target);modal.close();onPropertyUpdating(target);- target.add(TriggerListEditPanel.this);+ target.add(JobTriggerListEditPanel.this);}@Overridepublic Job getJob() {- return TriggerListEditPanel.this.getJob();+ return JobTriggerListEditPanel.this.getJob();}};@@ -164,7 +164,7 @@ class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {markFormDirty(target);triggers.remove(rowModel.getObject());onPropertyUpdating(target);- target.add(TriggerListEditPanel.this);+ target.add(JobTriggerListEditPanel.this);}});@@ -206,7 +206,7 @@ class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {Collections.swap(triggers, fromIndex-i, fromIndex-i-1);}onPropertyUpdating(target);- target.add(TriggerListEditPanel.this);+ target.add(JobTriggerListEditPanel.this);}}.sortable("tbody"));@@ -233,7 +233,7 @@ class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new TriggerCssResourceReference()));+ response.render(CssHeaderItem.forReference(new JobTriggerCssResourceReference()));}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditSupport.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditSupport.javaindex 78f8423505..862f46f9db 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditSupport.java@@ -16,7 +16,7 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyViewer;@SuppressWarnings("serial")-public class TriggerListEditSupport implements EditSupport {+public class JobTriggerListEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {@@ -32,7 +32,7 @@ public class TriggerListEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {if (model.getObject() != null) {- return new TriggerListViewPanel(id, model.getObject());+ return new JobTriggerListViewPanel(id, model.getObject());} else {return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}@@ -43,7 +43,7 @@ public class TriggerListEditSupport implements EditSupport {@Overridepublic PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {- return new TriggerListEditPanel(componentId, descriptor, model);+ return new JobTriggerListEditPanel(componentId, descriptor, model);}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.javaindex 0bc479cef4..db5e29b2ea 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.java@@ -31,11 +31,11 @@ import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.layout.SideFloating;@SuppressWarnings("serial")-class TriggerListViewPanel extends Panel {+class JobTriggerListViewPanel extends Panel {private final List<JobTrigger> triggers = new ArrayList<>();- public TriggerListViewPanel(String id, List<Serializable> elements) {+ public JobTriggerListViewPanel(String id, List<Serializable> elements) {super(id);for (Serializable each: elements)@@ -127,7 +127,7 @@ class TriggerListViewPanel extends Panel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new TriggerCssResourceReference()));+ response.render(CssHeaderItem.forReference(new JobTriggerCssResourceReference()));}private abstract class ColumnFragment extends Fragment {@@ -135,7 +135,7 @@ class TriggerListViewPanel extends Panel {private final int index;public ColumnFragment(String id, int index) {- super(id, "columnFrag", TriggerListViewPanel.this);+ super(id, "columnFrag", JobTriggerListViewPanel.this);this.index = index;}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerCssResourceReference.javadeleted file mode 100644index 8f65987326..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.editable.job.trigger;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class TriggerCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public TriggerCssResourceReference() {- super(TriggerCssResourceReference.class, "trigger.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/trigger.css b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/job-trigger.csssimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/job/trigger/trigger.cssrename to server-core/src/main/java/io/onedev/server/web/editable/job/trigger/job-trigger.cssdiff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.javaindex 2a28588bbe..797607277b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java@@ -38,6 +38,8 @@ import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.datatable.DefaultDataTable;import io.onedev.server.web.page.admin.AdministrationPage;+import io.onedev.server.web.page.admin.group.create.NewGroupPage;+import io.onedev.server.web.page.admin.group.profile.GroupProfilePage;import io.onedev.server.web.util.ConfirmOnClick;import io.onedev.server.web.util.PagingHistorySupport;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.javaindex aa24835ce3..07ce253590 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java@@ -26,6 +26,9 @@ import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.admin.AdministrationPage;+import io.onedev.server.web.page.admin.group.authorization.GroupAuthorizationsPage;+import io.onedev.server.web.page.admin.group.membership.GroupMembershipsPage;+import io.onedev.server.web.page.admin.group.profile.GroupProfilePage;@SuppressWarnings("serial")public abstract class GroupPage extends AdministrationPage {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.javarename to server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.javaindex 3952f09d61..6dcafb8249 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.admin.group;+package io.onedev.server.web.page.admin.group.authorization;import java.util.ArrayList;import java.util.Collection;@@ -18,6 +18,7 @@ import io.onedev.server.model.GroupAuthorization;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.page.admin.AuthorizationBean;import io.onedev.server.web.page.admin.AuthorizationsBean;+import io.onedev.server.web.page.admin.group.GroupPage;@SuppressWarnings("serial")public class GroupAuthorizationsPage extends GroupPage {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/create/NewGroupPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/admin/group/create/NewGroupPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/create/NewGroupPage.javasimilarity index 90%rename from server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.javarename to server-core/src/main/java/io/onedev/server/web/page/admin/group/create/NewGroupPage.javaindex 8ea5044dee..81bf3c624f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/create/NewGroupPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.admin.group;+package io.onedev.server.web.page.admin.group.create;import org.apache.wicket.Session;import org.apache.wicket.markup.head.CssHeaderItem;@@ -15,6 +15,8 @@ import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.Path;import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.page.admin.AdministrationPage;+import io.onedev.server.web.page.admin.group.GroupCssResourceReference;+import io.onedev.server.web.page.admin.group.membership.GroupMembershipsPage;@SuppressWarnings("serial")public class NewGroupPage extends AdministrationPage {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.javasimilarity index 98%rename from server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.javarename to server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.javaindex 38f3a8b293..cb756a0496 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.admin.group;+package io.onedev.server.web.page.admin.group.membership;import java.util.ArrayList;import java.util.Collection;@@ -51,7 +51,8 @@ import io.onedev.server.web.component.select2.SelectToAddChoice;import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.component.user.choice.AbstractUserChoiceProvider;import io.onedev.server.web.component.user.choice.UserChoiceResourceReference;-import io.onedev.server.web.page.admin.user.UserProfilePage;+import io.onedev.server.web.page.admin.group.GroupPage;+import io.onedev.server.web.page.admin.user.profile.UserProfilePage;import io.onedev.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/profile/GroupProfilePage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/admin/group/profile/GroupProfilePage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/profile/GroupProfilePage.javasimilarity index 94%rename from server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.javarename to server-core/src/main/java/io/onedev/server/web/page/admin/group/profile/GroupProfilePage.javaindex 1ca7ec32ad..9de2a97010 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/profile/GroupProfilePage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.admin.group;+package io.onedev.server.web.page.admin.group.profile;import java.io.Serializable;@@ -18,6 +18,8 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.Path;import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.page.admin.group.GroupListPage;+import io.onedev.server.web.page.admin.group.GroupPage;import io.onedev.server.web.util.ConfirmOnClick;@SuppressWarnings("serial")diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.javaindex 3f4eb9be51..e4a4616708 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java@@ -40,6 +40,8 @@ import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;import io.onedev.server.web.component.user.UserDeleteLink;import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.page.admin.AdministrationPage;+import io.onedev.server.web.page.admin.user.create.NewUserPage;+import io.onedev.server.web.page.admin.user.profile.UserProfilePage;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.util.PagingHistorySupport;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex 6a6aac3d77..bf2d7bf74b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java@@ -26,8 +26,14 @@ import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.page.admin.AdministrationPage;+import io.onedev.server.web.page.admin.user.authorization.UserAuthorizationsPage;+import io.onedev.server.web.page.admin.user.avatar.UserAvatarPage;import io.onedev.server.web.page.admin.user.buildsetting.UserBuildSettingPage;-import io.onedev.server.web.page.admin.user.buildsetting.UserSecretListPage;+import io.onedev.server.web.page.admin.user.buildsetting.UserSecretsPage;+import io.onedev.server.web.page.admin.user.membership.UserMembershipsPage;+import io.onedev.server.web.page.admin.user.password.UserPasswordPage;+import io.onedev.server.web.page.admin.user.profile.UserProfilePage;+import io.onedev.server.web.page.admin.user.webhook.UserWebHooksPage;@SuppressWarnings("serial")public abstract class UserPage extends AdministrationPage {@@ -84,10 +90,10 @@ public abstract class UserPage extends AdministrationPage {tabs.add(new UserTab("Edit Avatar", "fa fa-fw fa-picture-o", UserAvatarPage.class));tabs.add(new UserTab("Change Password", "fa fa-fw fa-key", UserPasswordPage.class));- tabs.add(new UserTab("Access Token", "fa fa-fw fa-ticket", UserTokenPage.class));tabs.add(new UserTab("Belonging Groups", "fa fa-fw fa-group", UserMembershipsPage.class));tabs.add(new UserTab("Authorized Projects", "fa fa-fw fa-ext fa-repo", UserAuthorizationsPage.class));- tabs.add(new UserTab("Build Setting", "fa fa-fw fa-cubes", UserSecretListPage.class, UserBuildSettingPage.class));+ tabs.add(new UserTab("Build Setting", "fa fa-fw fa-cubes", UserSecretsPage.class, UserBuildSettingPage.class));+ tabs.add(new UserTab("Web Hooks", "fa fa-fw fa-volume-up", UserWebHooksPage.class, UserWebHooksPage.class));return tabs;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserTab.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserTab.javaindex 3bfd2d654f..2525c8df1f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserTab.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserTab.java@@ -1,5 +1,7 @@package io.onedev.server.web.page.admin.user;+import javax.annotation.Nullable;+import org.apache.wicket.Component;import org.apache.wicket.model.Model;@@ -10,20 +12,20 @@ public class UserTab extends PageTab {private final String iconClass;- public UserTab(String title, String iconClass, Class<? extends UserPage> mainPageClass) {+ public UserTab(String title, @Nullable String iconClass, Class<? extends UserPage> mainPageClass) {super(Model.of(title), mainPageClass);this.iconClass = iconClass;}- public UserTab(String title, String iconClass, Class<? extends UserPage> mainPageClass,+ public UserTab(String title, @Nullable String iconClass, Class<? extends UserPage> mainPageClass,Class<? extends UserPage> additionalPageClass1) {super(Model.of(title), mainPageClass, additionalPageClass1);this.iconClass = iconClass;}- public UserTab(String title, String iconClass, Class<? extends UserPage> mainPageClass,+ public UserTab(String title, @Nullable String iconClass, Class<? extends UserPage> mainPageClass,Class<? extends UserPage> additionalPageClass1,Class<? extends UserPage> additionalPageClass2) {super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2);@@ -31,7 +33,7 @@ public class UserTab extends PageTab {this.iconClass = iconClass;}- public UserTab(String title, String iconClass, Class<? extends UserPage> mainPageClass,+ public UserTab(String title, @Nullable String iconClass, Class<? extends UserPage> mainPageClass,Class<? extends UserPage> additionalPageClass1,Class<? extends UserPage> additionalPageClass2,Class<? extends UserPage> additionalPageClass3) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserTabLink.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserTabLink.javaindex 7346bed326..5ffc3fd327 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserTabLink.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserTabLink.java@@ -26,7 +26,10 @@ public class UserTabLink extends Panel {UserPage page = (UserPage) getPage();Link<Void> link = new ViewStateAwarePageLink<Void>("link",tab.getMainPageClass(), UserPage.paramsOf(page.getUser()));- link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));+ if (tab.getIconClass() != null)+ link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));+ else+ link.add(new WebMarkupContainer("icon").setVisible(false));link.add(new Label("label", tab.getTitleModel()));add(link);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserTokenPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserTokenPage.htmldeleted file mode 100644index 8fe73e67ec..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserTokenPage.html+++ /dev/null@@ -1,4 +0,0 @@-<wicket:extend>- <div class="page-title">Access Token</div>- <div wicket:id="content"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserTokenPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserTokenPage.javadeleted file mode 100644index 54b62a6778..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserTokenPage.java+++ /dev/null@@ -1,21 +0,0 @@-package io.onedev.server.web.page.admin.user;--import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.web.component.user.tokengenerate.TokenGeneratePanel;--@SuppressWarnings("serial")-public class UserTokenPage extends UserPage {-- public UserTokenPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new TokenGeneratePanel("content", userModel));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.javarename to server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.javaindex 8c89f35f81..330ab89fb5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.admin.user;+package io.onedev.server.web.page.admin.user.authorization;import java.util.ArrayList;import java.util.Collection;@@ -18,6 +18,7 @@ import io.onedev.server.model.UserAuthorization;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.page.admin.AuthorizationBean;import io.onedev.server.web.page.admin.AuthorizationsBean;+import io.onedev.server.web.page.admin.user.UserPage;@SuppressWarnings("serial")public class UserAuthorizationsPage extends UserPage {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAvatarPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/avatar/UserAvatarPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAvatarPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/admin/user/avatar/UserAvatarPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAvatarPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/avatar/UserAvatarPage.javasimilarity index 79%rename from server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAvatarPage.javarename to server-core/src/main/java/io/onedev/server/web/page/admin/user/avatar/UserAvatarPage.javaindex bb61508634..9d01c866cb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAvatarPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/avatar/UserAvatarPage.java@@ -1,8 +1,9 @@-package io.onedev.server.web.page.admin.user;+package io.onedev.server.web.page.admin.user.avatar;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.web.component.user.avataredit.AvatarEditPanel;+import io.onedev.server.web.page.admin.user.UserPage;@SuppressWarnings("serial")public class UserAvatarPage extends UserPage {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreservationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreservationsPage.htmlnew file mode 100644index 0000000000..b91eb3d318--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreservationsPage.html@@ -0,0 +1,6 @@+<wicket:extend>+ <div class="help-block">Define common rules to preserve builds for all projects owned+ by current user. A build will be preserved as long as one rule preserves it. All builds+ will be preserved if no rules are defined</div>+ <div wicket:id="buildPreservations"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreservationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreservationsPage.javanew file mode 100644index 0000000000..23fd93034a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreservationsPage.java@@ -0,0 +1,39 @@+package io.onedev.server.web.page.admin.user.buildsetting;++import java.util.List;++import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.support.BuildPreservation;+import io.onedev.server.web.component.build.perservation.BuildPreservationListPanel;+import io.onedev.server.web.component.build.perservation.BuildPreservationsBean;++@SuppressWarnings("serial")+public class UserBuildPreservationsPage extends UserBuildSettingPage {++ public UserBuildPreservationsPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ BuildPreservationsBean bean = new BuildPreservationsBean();+ bean.setBuildPreservations(getBuildSetting().getBuildPreservations());+ add(new BuildPreservationListPanel("buildPreservations", bean) {++ @Override+ protected void onSaved(List<BuildPreservation> buildPreservations) {+ getBuildSetting().setBuildPreservations(buildPreservations);+ OneDev.getInstance(UserManager.class).save(getUser());+ setResponsePage(UserBuildPreservationsPage.class,+ UserBuildPreservationsPage.paramsOf(getUser()));+ }++ });+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreserveRulesPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreserveRulesPage.htmldeleted file mode 100644index c58fc6d6bf..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreserveRulesPage.html+++ /dev/null@@ -1,12 +0,0 @@-<wicket:extend>- <div class="help-block">Define common rules to preserve builds for all projects owned- by current user. A build will be preserved as long as one rule preserves it. All builds- will be preserved if no rules are defined</div>- <form wicket:id="form" class="leave-confirm build-preservations">- <div wicket:id="feedback"></div>- <div wicket:id="editor"></div>- <div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Save">- </div>- </form>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreserveRulesPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreserveRulesPage.javadeleted file mode 100644index 6865591ce4..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreserveRulesPage.java+++ /dev/null@@ -1,52 +0,0 @@-package io.onedev.server.web.page.admin.user.buildsetting;--import java.io.Serializable;--import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.web.editable.PropertyContext;--@SuppressWarnings("serial")-public class UserBuildPreserveRulesPage extends UserBuildSettingPage {-- public UserBuildPreserveRulesPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- OneDev.getInstance(UserManager.class).save(getUser());- getSession().success("Build preserve rules have been saved");- setResponsePage(UserBuildPreserveRulesPage.class, UserBuildPreserveRulesPage.paramsOf(getUser()));- }-- };-- form.add(new FencedFeedbackPanel("feedback", form));-- form.add(PropertyContext.editModel("editor", new AbstractReadOnlyModel<Serializable>() {-- @Override- public Serializable getObject() {- return getUser().getBuildSetting();- }-- }, "buildPreservations"));-- add(form);- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.javaindex c2f6f2624e..6a9b25bcef 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.java@@ -3,18 +3,13 @@ package io.onedev.server.web.page.admin.user.buildsetting;import java.util.ArrayList;import java.util.List;-import org.apache.wicket.Component;-import org.apache.wicket.Page;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.web.component.tabbable.PageTab;-import io.onedev.server.web.component.tabbable.PageTabLink;+import io.onedev.server.model.support.UserBuildSetting;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.admin.user.UserPage;+import io.onedev.server.web.page.admin.user.UserTab;@SuppressWarnings("serial")public abstract class UserBuildSettingPage extends UserPage {@@ -28,36 +23,13 @@ public abstract class UserBuildSettingPage extends UserPage {super.onInitialize();List<Tab> tabs = new ArrayList<>();- tabs.add(new PageTab(Model.of("Secrets"), UserSecretListPage.class) {-- @Override- public Component render(String componentId) {- return new TabLink(componentId, this);- }-- });-- tabs.add(new PageTab(Model.of("Build Preserve Rules"), UserBuildPreserveRulesPage.class) {-- @Override- public Component render(String componentId) {- return new TabLink(componentId, this);- }-- });+ tabs.add(new UserTab("Secrets", null, UserSecretsPage.class));+ tabs.add(new UserTab("Build Preserve Rules", null, UserBuildPreservationsPage.class));add(new Tabbable("buildSettingTabs", tabs));}-- private class TabLink extends PageTabLink {-- public TabLink(String id, PageTab tab) {- super(id, tab);- }-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new BookmarkablePageLink<Void>(linkId, pageClass, UserPage.paramsOf(getUser()));- }-++ protected UserBuildSetting getBuildSetting() {+ return getUser().getBuildSetting();}+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretListPage.htmldeleted file mode 100644index 4a44d4f392..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretListPage.html+++ /dev/null@@ -1,10 +0,0 @@-<wicket:extend>- <div wicket:id="note" class="help-block"></div>- <form wicket:id="form" class="leave-confirm secrets">- <div wicket:id="feedback"></div>- <div wicket:id="editor"></div>- <div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Save">- </div>- </form>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretListPage.javadeleted file mode 100644index 0347d9deb2..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretListPage.java+++ /dev/null@@ -1,72 +0,0 @@-package io.onedev.server.web.page.admin.user.buildsetting;--import java.io.Serializable;-import java.util.HashSet;-import java.util.Set;--import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.JobSecret;-import io.onedev.server.util.inputspec.SecretInput;-import io.onedev.server.web.editable.PropertyContext;--@SuppressWarnings("serial")-public class UserSecretListPage extends UserBuildSettingPage {-- public UserSecretListPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- Set<String> names = new HashSet<>();- for (JobSecret secret: getUser().getBuildSetting().getSecrets()) {- if (names.contains(secret.getName())) {- error("Duplicate name found: " + secret.getName());- return;- } else {- names.add(secret.getName());- }- }-- OneDev.getInstance(UserManager.class).save(getUser());- getSession().success("Job secrets have been saved");- setResponsePage(UserSecretListPage.class, UserSecretListPage.paramsOf(getUser()));- }-- };-- form.add(new FencedFeedbackPanel("feedback", form));-- form.add(PropertyContext.editModel("editor", new AbstractReadOnlyModel<Serializable>() {-- @Override- public Serializable getObject() {- return getUser().getBuildSetting();- }-- }, "secrets"));-- add(form);-- String note = String.format("Define commons secrets to be used in build jobs of all projects "- + "owned by current user. Secret value less than %d characters will not be masked "- + "in build log", SecretInput.MASK.length());- add(new Label("note", note).setEscapeModelStrings(false));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretsPage.htmlnew file mode 100644index 0000000000..8bea17cb9b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretsPage.html@@ -0,0 +1,4 @@+<wicket:extend>+ <div wicket:id="note" class="help-block"></div>+ <div wicket:id="secrets"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretsPage.javanew file mode 100644index 0000000000..64d2a4218e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretsPage.java@@ -0,0 +1,45 @@+package io.onedev.server.web.page.admin.user.buildsetting;++import java.util.List;++import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.support.JobSecret;+import io.onedev.server.util.inputspec.SecretInput;+import io.onedev.server.web.component.job.secret.JobSecretListPanel;+import io.onedev.server.web.component.job.secret.JobSecretsBean;++@SuppressWarnings("serial")+public class UserSecretsPage extends UserBuildSettingPage {++ public UserSecretsPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ JobSecretsBean bean = new JobSecretsBean();+ bean.setSecrets(getBuildSetting().getSecrets());+ add(new JobSecretListPanel("secrets", bean) {++ @Override+ protected void onSaved(List<JobSecret> secrets) {+ getBuildSetting().setSecrets(secrets);+ OneDev.getInstance(UserManager.class).save(getUser());+ setResponsePage(UserSecretsPage.class, UserSecretsPage.paramsOf(getUser()));+ }++ });++ String note = String.format("Define common secrets to be used in build jobs of all projects "+ + "owned by current user. Secret value less than %d characters will not be masked "+ + "in build log", SecretInput.MASK.length());+ add(new Label("note", note).setEscapeModelStrings(false));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.javarename to server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.javaindex 85a9d969a4..1b415a0c11 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.admin.user;+package io.onedev.server.web.page.admin.user.create;import org.apache.shiro.authc.credential.PasswordService;import org.apache.wicket.Session;@@ -18,6 +18,8 @@ import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.editable.Path;import io.onedev.server.web.page.admin.AdministrationPage;+import io.onedev.server.web.page.admin.user.UserCssResourceReference;+import io.onedev.server.web.page.admin.user.membership.UserMembershipsPage;@SuppressWarnings("serial")public class NewUserPage extends AdministrationPage {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.javasimilarity index 98%rename from server-core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.javarename to server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.javaindex 945c200b12..ab9b3b9ad5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.admin.user;+package io.onedev.server.web.page.admin.user.membership;import java.util.ArrayList;import java.util.Collection;@@ -49,7 +49,8 @@ import io.onedev.server.web.component.groupchoice.GroupChoiceResourceReference;import io.onedev.server.web.component.select2.Response;import io.onedev.server.web.component.select2.ResponseFiller;import io.onedev.server.web.component.select2.SelectToAddChoice;-import io.onedev.server.web.page.admin.group.GroupProfilePage;+import io.onedev.server.web.page.admin.group.profile.GroupProfilePage;+import io.onedev.server.web.page.admin.user.UserPage;import io.onedev.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPasswordPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPasswordPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPasswordPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.javasimilarity index 79%rename from server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPasswordPage.javarename to server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.javaindex afc5056904..1ec011c62b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPasswordPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/password/UserPasswordPage.java@@ -1,8 +1,9 @@-package io.onedev.server.web.page.admin.user;+package io.onedev.server.web.page.admin.user.password;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.web.component.user.passwordedit.PasswordEditPanel;+import io.onedev.server.web.page.admin.user.UserPage;@SuppressWarnings("serial")public class UserPasswordPage extends UserPage {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserProfilePage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/profile/UserProfilePage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/admin/user/UserProfilePage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/admin/user/profile/UserProfilePage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserProfilePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/profile/UserProfilePage.javasimilarity index 79%rename from server-core/src/main/java/io/onedev/server/web/page/admin/user/UserProfilePage.javarename to server-core/src/main/java/io/onedev/server/web/page/admin/user/profile/UserProfilePage.javaindex 3755076b8e..2db0a2db7b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserProfilePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/profile/UserProfilePage.java@@ -1,8 +1,9 @@-package io.onedev.server.web.page.admin.user;+package io.onedev.server.web.page.admin.user.profile;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.web.component.user.profileedit.ProfileEditPanel;+import io.onedev.server.web.page.admin.user.UserPage;@SuppressWarnings("serial")public class UserProfilePage extends UserPage {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/webhook/UserWebHooksPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/webhook/UserWebHooksPage.htmlnew file mode 100644index 0000000000..d0a596a5e1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/webhook/UserWebHooksPage.html@@ -0,0 +1,7 @@+<wicket:extend>+ <div class="page-title">Web Hooks</div>+ <div class="help-block">+ Define common web hooks for all projects owned by current user+ </div>+ <div wicket:id="webHooks"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/webhook/UserWebHooksPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/webhook/UserWebHooksPage.javanew file mode 100644index 0000000000..43e90e6c5d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/webhook/UserWebHooksPage.java@@ -0,0 +1,39 @@+package io.onedev.server.web.page.admin.user.webhook;++import java.util.ArrayList;++import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.support.WebHook;+import io.onedev.server.web.component.webhook.WebHookListPanel;+import io.onedev.server.web.component.webhook.WebHooksBean;+import io.onedev.server.web.page.admin.user.UserPage;++@SuppressWarnings("serial")+public class UserWebHooksPage extends UserPage {++ public UserWebHooksPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ WebHooksBean bean = new WebHooksBean();+ bean.setWebHooks(getUser().getWebHooks());+ add(new WebHookListPanel("webHooks", bean) {++ @Override+ protected void onSaved(ArrayList<WebHook> webHooks) {+ getUser().setWebHooks(bean.getWebHooks());+ OneDev.getInstance(UserManager.class).save(getUser());+ setResponsePage(UserWebHooksPage.class, UserWebHooksPage.paramsOf(getUser()));+ }++ });+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.htmlindex 585830828e..51f2f6f115 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html@@ -65,6 +65,7 @@<li wicket:id="myAvatar"><a wicket:id="link"><i class="fa fa-fw fa-picture-o"></i> Edit Avatar</a></li><li wicket:id="myPassword"><a wicket:id="link"><i class="fa fa-fw fa-key"></i> Change Password</a></li><li wicket:id="myBuildSetting"><a wicket:id="link"><i class="fa fa-fw fa-cubes"></i> Build Setting</a></li>+ <li wicket:id="myWebHooks"><a wicket:id="link"><i class="fa fa-fw fa-volume-up"></i> Web Hooks</a></li><li role="separator" class="divider"></li><li><a wicket:id="signOut"><i class="fa fa-fw fa-sign-out"></i> <span wicket:id="label"></span></a></li></ul>diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 518ea3f99f..1a5d5dabae 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -27,7 +27,7 @@ import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;import io.onedev.server.web.page.admin.group.GroupListPage;import io.onedev.server.web.page.admin.group.GroupPage;-import io.onedev.server.web.page.admin.group.NewGroupPage;+import io.onedev.server.web.page.admin.group.create.NewGroupPage;import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;import io.onedev.server.web.page.admin.jobexecutor.JobExecutorPage;@@ -39,16 +39,17 @@ import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;import io.onedev.server.web.page.admin.serverlog.ServerLogPage;import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;-import io.onedev.server.web.page.admin.user.NewUserPage;import io.onedev.server.web.page.admin.user.UserListPage;import io.onedev.server.web.page.admin.user.UserPage;+import io.onedev.server.web.page.admin.user.create.NewUserPage;import io.onedev.server.web.page.base.BasePage;-import io.onedev.server.web.page.my.MyAvatarPage;import io.onedev.server.web.page.my.MyPage;-import io.onedev.server.web.page.my.MyPasswordPage;-import io.onedev.server.web.page.my.MyProfilePage;+import io.onedev.server.web.page.my.avatar.MyAvatarPage;import io.onedev.server.web.page.my.buildsetting.MyBuildSettingPage;-import io.onedev.server.web.page.my.buildsetting.MySecretListPage;+import io.onedev.server.web.page.my.buildsetting.MySecretsPage;+import io.onedev.server.web.page.my.password.MyPasswordPage;+import io.onedev.server.web.page.my.profile.MyProfilePage;+import io.onedev.server.web.page.my.webhook.MyWebHooksPage;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.page.security.LogoutPage;@@ -200,12 +201,17 @@ public abstract class LayoutPage extends BasePage {item.add(new ViewStateAwarePageLink<Void>("link", MyPasswordPage.class));if (getPage() instanceof MyPasswordPage)item.add(AttributeAppender.append("class", "active"));-+signedInContainer.add(item = new WebMarkupContainer("myBuildSetting"));- item.add(new ViewStateAwarePageLink<Void>("link", MySecretListPage.class));+ item.add(new ViewStateAwarePageLink<Void>("link", MySecretsPage.class));if (getPage() instanceof MyBuildSettingPage)item.add(AttributeAppender.append("class", "active"));+ signedInContainer.add(item = new WebMarkupContainer("myWebHooks"));+ item.add(new ViewStateAwarePageLink<Void>("link", MyWebHooksPage.class));+ if (getPage() instanceof MyWebHooksPage)+ item.add(AttributeAppender.append("class", "active"));+if (SecurityUtils.getSubject().isRunAs()) {Link<Void> signOutLink = new Link<Void>("signOut") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/MyAvatarPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/my/MyAvatarPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/my/MyAvatarPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/web/page/my/MyAvatarPage.javarename to server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.javaindex 64faf9e492..f59dd8ef1e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/MyAvatarPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/avatar/MyAvatarPage.java@@ -1,10 +1,11 @@-package io.onedev.server.web.page.my;+package io.onedev.server.web.page.my.avatar;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.User;import io.onedev.server.web.component.user.avataredit.AvatarEditPanel;+import io.onedev.server.web.page.my.MyPage;@SuppressWarnings("serial")public class MyAvatarPage extends MyPage {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.htmlnew file mode 100644index 0000000000..9ac6adbaca--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.html@@ -0,0 +1,6 @@+<wicket:extend>+ <div class="help-block">Define common rules to preserve builds of all projects owned by me.+ A build will be preserved as long as one rule preserves it. All builds will be preserved+ if no rules are defined</div>+ <div wicket:id="buildPreservations"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.javanew file mode 100644index 0000000000..0af56bb7c1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.java@@ -0,0 +1,38 @@+package io.onedev.server.web.page.my.buildsetting;++import java.util.List;++import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.support.BuildPreservation;+import io.onedev.server.web.component.build.perservation.BuildPreservationListPanel;+import io.onedev.server.web.component.build.perservation.BuildPreservationsBean;++@SuppressWarnings("serial")+public class MyBuildPreservationsPage extends MyBuildSettingPage {++ public MyBuildPreservationsPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ BuildPreservationsBean bean = new BuildPreservationsBean();+ bean.setBuildPreservations(getBuildSetting().getBuildPreservations());+ add(new BuildPreservationListPanel("buildPreservations", bean) {++ @Override+ protected void onSaved(List<BuildPreservation> buildPreservations) {+ getBuildSetting().setBuildPreservations(buildPreservations);+ OneDev.getInstance(UserManager.class).save(getLoginUser());+ setResponsePage(MyBuildPreservationsPage.class);+ }++ });+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreserveRulesPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreserveRulesPage.htmldeleted file mode 100644index 5719bc4614..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreserveRulesPage.html+++ /dev/null@@ -1,12 +0,0 @@-<wicket:extend>- <div class="help-block">Define common rules to preserve builds of all projects owned by me.- A build will be preserved as long as one rule preserves it. All builds will be preserved- if no rules are defined</div>- <form wicket:id="form" class="leave-confirm build-preservations">- <div wicket:id="feedback"></div>- <div wicket:id="editor"></div>- <div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Save">- </div>- </form>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreserveRulesPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreserveRulesPage.javadeleted file mode 100644index 2838db6838..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreserveRulesPage.java+++ /dev/null@@ -1,52 +0,0 @@-package io.onedev.server.web.page.my.buildsetting;--import java.io.Serializable;--import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.web.editable.PropertyContext;--@SuppressWarnings("serial")-public class MyBuildPreserveRulesPage extends MyBuildSettingPage {-- public MyBuildPreserveRulesPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- OneDev.getInstance(UserManager.class).save(getLoginUser());- getSession().success("Build preserve rules have been saved");- setResponsePage(MyBuildPreserveRulesPage.class);- }-- };-- form.add(new FencedFeedbackPanel("feedback", form));-- form.add(PropertyContext.editModel("editor", new AbstractReadOnlyModel<Serializable>() {-- @Override- public Serializable getObject() {- return getLoginUser().getBuildSetting();- }-- }, "buildPreservations"));-- add(form);- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.javaindex b980075941..dde66e9acb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.java@@ -6,6 +6,7 @@ import java.util.List;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.model.support.UserBuildSetting;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;@@ -23,9 +24,13 @@ public abstract class MyBuildSettingPage extends MyPage {super.onInitialize();List<Tab> tabs = new ArrayList<>();- tabs.add(new PageTab(Model.of("Secrets"), MySecretListPage.class));- tabs.add(new PageTab(Model.of("Build Preserve Rules"), MyBuildPreserveRulesPage.class));+ tabs.add(new PageTab(Model.of("Secrets"), MySecretsPage.class));+ tabs.add(new PageTab(Model.of("Build Preserve Rules"), MyBuildPreservationsPage.class));add(new Tabbable("buildSettingTabs", tabs));}+ protected UserBuildSetting getBuildSetting() {+ return getLoginUser().getBuildSetting();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretListPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretListPage.htmldeleted file mode 100644index 4a44d4f392..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretListPage.html+++ /dev/null@@ -1,10 +0,0 @@-<wicket:extend>- <div wicket:id="note" class="help-block"></div>- <form wicket:id="form" class="leave-confirm secrets">- <div wicket:id="feedback"></div>- <div wicket:id="editor"></div>- <div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Save">- </div>- </form>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretListPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretListPage.javadeleted file mode 100644index daae73f735..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretListPage.java+++ /dev/null@@ -1,72 +0,0 @@-package io.onedev.server.web.page.my.buildsetting;--import java.io.Serializable;-import java.util.HashSet;-import java.util.Set;--import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.JobSecret;-import io.onedev.server.util.inputspec.SecretInput;-import io.onedev.server.web.editable.PropertyContext;--@SuppressWarnings("serial")-public class MySecretListPage extends MyBuildSettingPage {-- public MySecretListPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- Set<String> names = new HashSet<>();- for (JobSecret secret: getLoginUser().getBuildSetting().getSecrets()) {- if (names.contains(secret.getName())) {- error("Duplicate name found: " + secret.getName());- return;- } else {- names.add(secret.getName());- }- }-- OneDev.getInstance(UserManager.class).save(getLoginUser());- getSession().success("Job secrets have been saved");- setResponsePage(MySecretListPage.class);- }-- };-- form.add(new FencedFeedbackPanel("feedback", form));-- form.add(PropertyContext.editModel("editor", new AbstractReadOnlyModel<Serializable>() {-- @Override- public Serializable getObject() {- return getLoginUser().getBuildSetting();- }-- }, "secrets"));-- add(form);-- String note = String.format("Define commons secrets to be used in build jobs of all projects "- + "owned by me. Secret value less than %d characters will not be masked "- + "in build log", SecretInput.MASK.length());- add(new Label("note", note).setEscapeModelStrings(false));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretsPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretsPage.htmlnew file mode 100644index 0000000000..8bea17cb9b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretsPage.html@@ -0,0 +1,4 @@+<wicket:extend>+ <div wicket:id="note" class="help-block"></div>+ <div wicket:id="secrets"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretsPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretsPage.javanew file mode 100644index 0000000000..a35b4ca77f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretsPage.java@@ -0,0 +1,45 @@+package io.onedev.server.web.page.my.buildsetting;++import java.util.List;++import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.support.JobSecret;+import io.onedev.server.util.inputspec.SecretInput;+import io.onedev.server.web.component.job.secret.JobSecretListPanel;+import io.onedev.server.web.component.job.secret.JobSecretsBean;++@SuppressWarnings("serial")+public class MySecretsPage extends MyBuildSettingPage {++ public MySecretsPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ JobSecretsBean bean = new JobSecretsBean();+ bean.setSecrets(getBuildSetting().getSecrets());+ add(new JobSecretListPanel("secrets", bean) {++ @Override+ protected void onSaved(List<JobSecret> secrets) {+ getBuildSetting().setSecrets(secrets);+ OneDev.getInstance(UserManager.class).save(getLoginUser());+ setResponsePage(MySecretsPage.class);+ }++ });++ String note = String.format("Define common secrets to be used in build jobs of all projects "+ + "owned by me. Secret value less than %d characters will not be masked "+ + "in build log", SecretInput.MASK.length());+ add(new Label("note", note).setEscapeModelStrings(false));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/MyPasswordPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/my/MyPasswordPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/my/MyPasswordPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/web/page/my/MyPasswordPage.javarename to server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.javaindex 15e0ffbb13..0e3854334a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/MyPasswordPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/password/MyPasswordPage.java@@ -1,10 +1,11 @@-package io.onedev.server.web.page.my;+package io.onedev.server.web.page.my.password;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.User;import io.onedev.server.web.component.user.passwordedit.PasswordEditPanel;+import io.onedev.server.web.page.my.MyPage;@SuppressWarnings("serial")public class MyPasswordPage extends MyPage {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/MyProfilePage.html b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/my/MyProfilePage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/my/MyProfilePage.java b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/web/page/my/MyProfilePage.javarename to server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.javaindex 44088a756a..5721dc083b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/MyProfilePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.java@@ -1,10 +1,11 @@-package io.onedev.server.web.page.my;+package io.onedev.server.web.page.my.profile;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.User;import io.onedev.server.web.component.user.profileedit.ProfileEditPanel;+import io.onedev.server.web.page.my.MyPage;@SuppressWarnings("serial")public class MyProfilePage extends MyPage {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/webhook/MyWebHooksPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/webhook/MyWebHooksPage.htmlnew file mode 100644index 0000000000..08d76b1191--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/webhook/MyWebHooksPage.html@@ -0,0 +1,7 @@+<wicket:extend>+ <div class="page-title">Web Hooks</div>+ <div class="help-block">+ Define common web hooks for all projects owned by me+ </div>+ <div wicket:id="webHooks"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/webhook/MyWebHooksPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/webhook/MyWebHooksPage.javanew file mode 100644index 0000000000..b82f4968a1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/webhook/MyWebHooksPage.java@@ -0,0 +1,39 @@+package io.onedev.server.web.page.my.webhook;++import java.util.ArrayList;++import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.support.WebHook;+import io.onedev.server.web.component.webhook.WebHookListPanel;+import io.onedev.server.web.component.webhook.WebHooksBean;+import io.onedev.server.web.page.my.MyPage;++@SuppressWarnings("serial")+public class MyWebHooksPage extends MyPage {++ public MyWebHooksPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ WebHooksBean bean = new WebHooksBean();+ bean.setWebHooks(getLoginUser().getWebHooks());+ add(new WebHookListPanel("webHooks", bean) {++ @Override+ protected void onSaved(ArrayList<WebHook> webHooks) {+ getLoginUser().setWebHooks(bean.getWebHooks());+ OneDev.getInstance(UserManager.class).save(getLoginUser());+ setResponsePage(MyWebHooksPage.class);+ }++ });+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 83a89f563e..ad72e6f4fe 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -59,14 +59,14 @@ import io.onedev.server.web.page.project.setting.ProjectSettingPage;import io.onedev.server.web.page.project.setting.ProjectSettingTab;import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;-import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;+import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionsPage;import io.onedev.server.web.page.project.setting.build.ProjectBuildSettingPage;-import io.onedev.server.web.page.project.setting.build.ProjectSecretListPage;+import io.onedev.server.web.page.project.setting.build.ProjectSecretsPage;import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;import io.onedev.server.web.page.project.setting.issue.ProjectIssueSettingPage;import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;-import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage;-import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;+import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionsPage;+import io.onedev.server.web.page.project.setting.webhook.ProjectWebHooksPage;import io.onedev.server.web.page.project.stats.ProjectContribsPage;import io.onedev.server.web.page.project.stats.ProjectStatsPage;import io.onedev.server.web.page.project.tags.ProjectTagsPage;@@ -307,13 +307,13 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {tabs.add(new ProjectSettingTab("General Setting", "fa fa-fw fa-sliders", GeneralSettingPage.class));tabs.add(new ProjectSettingTab("Edit Avatar", "fa fa-fw fa-picture-o", AvatarEditPage.class));tabs.add(new ProjectSettingTab("Authorizations", "fa fa-fw fa-user", ProjectAuthorizationsPage.class));- tabs.add(new ProjectSettingTab("Branch Protection", "fa fa-fw fa-lock", BranchProtectionPage.class));- tabs.add(new ProjectSettingTab("Tag Protection", "fa fa-fw fa-lock", TagProtectionPage.class));+ tabs.add(new ProjectSettingTab("Branch Protection", "fa fa-fw fa-lock", BranchProtectionsPage.class));+ tabs.add(new ProjectSettingTab("Tag Protection", "fa fa-fw fa-lock", TagProtectionsPage.class));tabs.add(new ProjectSettingTab("Issue Setting", "fa fa-fw fa-bug",StateTransitionsPage.class, ProjectIssueSettingPage.class));tabs.add(new ProjectSettingTab("Build Setting", "fa fa-fw fa-cubes",- ProjectSecretListPage.class, ProjectBuildSettingPage.class));- tabs.add(new ProjectSettingTab("Web Hooks", "fa fa-fw fa-volume-up", WebHooksPage.class));+ ProjectSecretsPage.class, ProjectBuildSettingPage.class));+ tabs.add(new ProjectSettingTab("Web Hooks", "fa fa-fw fa-volume-up", ProjectWebHooksPage.class));return tabs;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex 2ac995f32a..451b93c635 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -403,7 +403,7 @@ public class ProjectBranchesPage extends ProjectPage {} else {Project project = getProject();BranchProtection protection = project.getBranchProtection(branchName, getLoginUser());- if (protection != null && protection.isNoCreation()) {+ if (protection.isNoCreation()) {form.error("Unable to create protected branch");target.focusComponent(nameInput);target.add(form);@@ -700,12 +700,10 @@ public class ProjectBranchesPage extends ProjectPage {Project project = getProject();if (SecurityUtils.canWriteCode(project)) {- if (project.getDefaultBranch().equals(branch)) {+ if (project.getDefaultBranch().equals(branch))setEnabled(false);- } else {- BranchProtection protection = project.getBranchProtection(branch, getLoginUser());- setEnabled(protection == null || !protection.isNoDeletion());- }+ else+ setEnabled(!project.getBranchProtection(branch, getLoginUser()).isNoDeletion());} else {setVisible(false);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.htmlindex e8c56f835e..0a021d235f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html@@ -1,15 +1,15 @@-<wicket:panel>- <div class="branch-protection panel panel-default">- <div class="panel-heading">- <span class="drag-indicator"><i class="fa fa-reorder"></i></span>- <a wicket:id="edit" title="Edit this protection"><i class="fa fa-pencil"></i></a>- <a wicket:id="delete" title="Delete this protection"><i class="fa fa-trash"></i></a>- <div class="checkbox">- <label><input wicket:id="enable" type="checkbox"> Enable</label>- </div>- </div>- <div class="panel-body">- <div wicket:id="protection"></div>- </div>- </div>+<wicket:panel>+ <div class="branch-protection panel panel-default">+ <div class="panel-heading">+ <span class="drag-indicator"><i class="fa fa-reorder"></i></span>+ <a wicket:id="edit" title="Edit this rule"><i class="fa fa-pencil"></i></a>+ <a wicket:id="delete" title="Delete this rule"><i class="fa fa-trash"></i></a>+ <div class="checkbox">+ <label><input wicket:id="enable" type="checkbox"> Enable</label>+ </div>+ </div>+ <div class="panel-body">+ <div wicket:id="protection"></div>+ </div>+ </div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.htmlsimilarity index 66%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.htmlindex 7eb7e518e6..2f33134a46 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.html@@ -1,24 +1,23 @@-<wicket:extend>- <div class="page-title">Branch Protection</div>- <div wicket:id="branchProtectionSetting" class="panel-list">- <ul class="list-unstyled protections">- <li wicket:id="protections" class="protection"><div wicket:id="protection"></div></li>- </ul>- <div wicket:id="newProtection"></div>- <div class="help-block">- <i class="fa fa-info-circle"></i> Specify branch protection rules here. For a given branch and submitter combination, the- first matching protection rule will be used- </div>- </div>- <wicket:fragment wicket:id="editNewFrag">- <div class="protection panel panel-default">- <div class="panel-heading"><div class="panel-title">Edit Protection</div></div>- <div class="panel-body">- <div wicket:id="editor"></div>- </div>- </div>- </wicket:fragment>- <wicket:fragment wicket:id="addNewLinkFrag">- <a wicket:id="link" class="add-new"><i class="fa fa-plus-circle fa-lg"></i> Add Protection</a>- </wicket:fragment>-</wicket:extend>+<wicket:extend>+ <div class="page-title">Branch Protection</div>+ <div class="help-block">+ Define branch protection rules+ </div>+ <div wicket:id="branchProtectionSetting" class="panel-list">+ <ul class="list-unstyled protections">+ <li wicket:id="protections" class="protection"><div wicket:id="protection"></div></li>+ </ul>+ <div wicket:id="newProtection"></div>+ </div>+ <wicket:fragment wicket:id="editNewFrag">+ <div class="protection panel panel-default">+ <div class="panel-heading"><div class="panel-title">Edit Rule</div></div>+ <div class="panel-body">+ <div wicket:id="editor"></div>+ </div>+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="addNewLinkFrag">+ <a wicket:id="link" class="add-new"><i class="fa fa-plus-circle fa-lg"></i> Add Rule</a>+ </wicket:fragment>+</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.javasimilarity index 94%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.javarename to server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.javaindex 8faeeac999..e90abb7020 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.java@@ -20,11 +20,11 @@ import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.page.project.setting.ProjectSettingPage;@SuppressWarnings("serial")-public class BranchProtectionPage extends ProjectSettingPage {+public class BranchProtectionsPage extends ProjectSettingPage {private WebMarkupContainer container;- public BranchProtectionPage(PageParameters params) {+ public BranchProtectionsPage(PageParameters params) {super(params);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreservationsPage.htmlsimilarity index 61%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreservationsPage.htmlindex a0936bf660..198d79691a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreservationsPage.html@@ -3,15 +3,7 @@All builds will be preserved if no rules are defined</div><div class="panel panel-default"><div class="panel-heading"><b>Project Specific</b></div>- <div class="panel-body">- <form wicket:id="form" class="leave-confirm build-preservations">- <div wicket:id="feedback"></div>- <div wicket:id="editor"></div>- <div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Save">- </div>- </form>- </div>+ <div class="panel-body" wicket:id="projectSpecificBuildPreservations"></div></div><div class="panel panel-default"><div class="panel-heading"><b>Inherited from <a wicket:id="owner">Owner</a></b></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreservationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreservationsPage.javanew file mode 100644index 0000000000..15541e1b2d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreservationsPage.java@@ -0,0 +1,50 @@+package io.onedev.server.web.page.project.setting.build;++import java.util.List;++import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.support.BuildPreservation;+import io.onedev.server.web.component.build.perservation.BuildPreservationListPanel;+import io.onedev.server.web.component.build.perservation.BuildPreservationsBean;+import io.onedev.server.web.component.link.SettingInOwnerLink;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.page.admin.user.buildsetting.UserBuildPreservationsPage;+import io.onedev.server.web.page.my.buildsetting.MyBuildPreservationsPage;++@SuppressWarnings("serial")+public class ProjectBuildPreservationsPage extends ProjectBuildSettingPage {++ public ProjectBuildPreservationsPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ BuildPreservationsBean bean = new BuildPreservationsBean();+ bean.setBuildPreservations(getProject().getBuildSetting().getBuildPreservations());+ add(new BuildPreservationListPanel("projectSpecificBuildPreservations", bean) {++ @Override+ protected void onSaved(List<BuildPreservation> buildPreservations) {+ getProject().getBuildSetting().setBuildPreservations(buildPreservations);+ OneDev.getInstance(ProjectManager.class).save(getProject());+ setResponsePage(ProjectBuildPreservationsPage.class,+ ProjectBuildPreservationsPage.paramsOf(getProject()));+ }++ });++ add(PropertyContext.view("inheritedBuildPreservations",+ getProject().getOwner().getBuildSetting(), "buildPreservations"));++ add(new SettingInOwnerLink("owner", projectModel, UserBuildPreservationsPage.class,+ MyBuildPreservationsPage.class));++ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.javadeleted file mode 100644index 3e07577240..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.java+++ /dev/null@@ -1,79 +0,0 @@-package io.onedev.server.web.page.project.setting.build;--import java.io.Serializable;--import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.util.SecurityUtils;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.page.admin.user.buildsetting.UserBuildPreserveRulesPage;-import io.onedev.server.web.page.my.buildsetting.MyBuildPreserveRulesPage;--@SuppressWarnings("serial")-public class ProjectBuildPreserveRulesPage extends ProjectBuildSettingPage {-- public ProjectBuildPreserveRulesPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- OneDev.getInstance(ProjectManager.class).save(getProject());- getSession().success("Build preserve rules have been saved");- setResponsePage(ProjectBuildPreserveRulesPage.class, ProjectBuildPreserveRulesPage.paramsOf(getProject()));- }-- };-- form.add(new FencedFeedbackPanel("feedback", form));-- form.add(PropertyContext.editModel("editor", new AbstractReadOnlyModel<Serializable>() {-- @Override- public Serializable getObject() {- return getProject().getBuildSetting();- }-- }, "buildPreservations"));-- add(form);-- add(PropertyContext.view("inheritedBuildPreservations",- getProject().getOwner().getBuildSetting(), "buildPreservations"));-- if (SecurityUtils.isAdministrator()) {- add(new BookmarkablePageLink<Void>("owner", UserBuildPreserveRulesPage.class,- UserBuildPreserveRulesPage.paramsOf(getProject().getOwner())));- } else if (getProject().getOwner().equals(SecurityUtils.getUser())) {- add(new BookmarkablePageLink<Void>("owner", MyBuildPreserveRulesPage.class));- } else {- add(new WebMarkupContainer("owner") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("span");- }-- });- }-- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.javaindex 4bffa49c7d..9b0db9714a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.java@@ -29,7 +29,7 @@ public abstract class ProjectBuildSettingPage extends ProjectSettingPage {super.onInitialize();List<Tab> tabs = new ArrayList<>();- tabs.add(new PageTab(Model.of("Secrets"), ProjectSecretListPage.class) {+ tabs.add(new PageTab(Model.of("Secrets"), ProjectSecretsPage.class) {@Overridepublic Component render(String componentId) {@@ -37,7 +37,7 @@ public abstract class ProjectBuildSettingPage extends ProjectSettingPage {}});- tabs.add(new PageTab(Model.of("Build Preserve Rules"), ProjectBuildPreserveRulesPage.class) {+ tabs.add(new PageTab(Model.of("Build Preserve Rules"), ProjectBuildPreservationsPage.class) {@Overridepublic Component render(String componentId) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.javadeleted file mode 100644index ca619f0b4d..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.java+++ /dev/null@@ -1,116 +0,0 @@-package io.onedev.server.web.page.project.setting.build;--import java.io.Serializable;-import java.util.HashSet;-import java.util.List;-import java.util.Set;--import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.support.JobSecret;-import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.inputspec.SecretInput;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.page.admin.user.buildsetting.UserSecretListPage;-import io.onedev.server.web.page.my.buildsetting.MySecretListPage;--@SuppressWarnings("serial")-public class ProjectSecretListPage extends ProjectBuildSettingPage {-- public ProjectSecretListPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- String note = String.format("Define secrets to be used in build jobs. Secret value less "- + "than %d characters will not be masked in build log", SecretInput.MASK.length());- add(new Label("note", note).setEscapeModelStrings(false));-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- Set<String> names = new HashSet<>();- for (JobSecret secret: getProject().getBuildSetting().getSecrets()) {- if (names.contains(secret.getName())) {- error("Duplicate name found: " + secret.getName());- return;- } else {- names.add(secret.getName());- }- }-- OneDev.getInstance(ProjectManager.class).save(getProject());- getSession().success("Job secrets have been saved");- setResponsePage(ProjectSecretListPage.class, ProjectSecretListPage.paramsOf(getProject()));- }-- };-- form.add(new FencedFeedbackPanel("feedback", form));-- form.add(PropertyContext.editModel("editor", new AbstractReadOnlyModel<Serializable>() {-- @Override- public Serializable getObject() {- return getProject().getBuildSetting();- }-- }, "secrets"));-- add(form);-- List<JobSecret> inheritedSecrets = getProject().getBuildSetting().getInheritedSecrets(getProject());- InheritedSecretsBean bean = new InheritedSecretsBean();- bean.setSecrets(inheritedSecrets);- add(PropertyContext.view("inheritedSecrets", bean, "secrets"));-- if (SecurityUtils.isAdministrator()) {- add(new BookmarkablePageLink<Void>("owner", UserSecretListPage.class,- UserSecretListPage.paramsOf(getProject().getOwner())));- } else if (getProject().getOwner().equals(SecurityUtils.getUser())) {- add(new BookmarkablePageLink<Void>("owner", MySecretListPage.class));- } else {- add(new WebMarkupContainer("owner") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("span");- }-- });- }- }-- @Editable- public static class InheritedSecretsBean implements Serializable {-- private List<JobSecret> secrets;-- @Editable- public List<JobSecret> getSecrets() {- return secrets;- }-- public void setSecrets(List<JobSecret> secrets) {- this.secrets = secrets;- }-- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretsPage.htmlsimilarity index 54%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretsPage.htmlindex f57251840e..68b3896c2d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretsPage.html@@ -2,15 +2,7 @@<div wicket:id="note" class="help-block"></div><div class="panel panel-default"><div class="panel-heading"><b>Project Specific</b></div>- <div class="panel-body">- <form wicket:id="form" class="leave-confirm secrets">- <div wicket:id="feedback"></div>- <div wicket:id="editor"></div>- <div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Save">- </div>- </form>- </div>+ <div wicket:id="projectSpecificSecrets" class="panel-body"></div></div><div class="panel panel-default"><div class="panel-heading"><b>Inherited from <a wicket:id="owner">Owner</a></b></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretsPage.javanew file mode 100644index 0000000000..3ac1734071--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretsPage.java@@ -0,0 +1,55 @@+package io.onedev.server.web.page.project.setting.build;++import java.util.List;++import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.support.JobSecret;+import io.onedev.server.util.inputspec.SecretInput;+import io.onedev.server.web.component.job.secret.JobSecretListPanel;+import io.onedev.server.web.component.job.secret.JobSecretsBean;+import io.onedev.server.web.component.link.SettingInOwnerLink;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.page.admin.user.buildsetting.UserSecretsPage;+import io.onedev.server.web.page.my.buildsetting.MySecretsPage;++@SuppressWarnings("serial")+public class ProjectSecretsPage extends ProjectBuildSettingPage {++ public ProjectSecretsPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ String note = String.format("Define secrets to be used in build jobs. Secret value less "+ + "than %d characters will not be masked in build log", SecretInput.MASK.length());+ add(new Label("note", note).setEscapeModelStrings(false));++ JobSecretsBean bean = new JobSecretsBean();+ bean.setSecrets(getProject().getBuildSetting().getSecrets());+ add(new JobSecretListPanel("projectSpecificSecrets", bean) {++ @Override+ protected void onSaved(List<JobSecret> secrets) {+ getProject().getBuildSetting().setSecrets(secrets);+ OneDev.getInstance(ProjectManager.class).save(getProject());+ setResponsePage(ProjectSecretsPage.class, ProjectSecretsPage.paramsOf(getProject()));+ }++ });++ List<JobSecret> inheritedSecrets = getProject().getBuildSetting().getInheritedSecrets(getProject());+ bean = new JobSecretsBean();+ bean.setSecrets(inheritedSecrets);+ add(PropertyContext.view("inheritedSecrets", bean, "secrets"));++ add(new SettingInOwnerLink("owner", projectModel, UserSecretsPage.class, MySecretsPage.class));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.htmlindex 629f3025de..5ae0ea0efb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html@@ -2,8 +2,8 @@<div class="tag-protection panel panel-default"><div class="panel-heading"><span class="drag-indicator"><i class="fa fa-reorder"></i></span>- <a wicket:id="edit" title="Edit this protection"><i class="fa fa-pencil"></i></a>- <a wicket:id="delete" title="Delete this protection"><i class="fa fa-trash"></i></a>+ <a wicket:id="edit" title="Edit this rule"><i class="fa fa-pencil"></i></a>+ <a wicket:id="delete" title="Delete this rule"><i class="fa fa-trash"></i></a><div class="checkbox"><label><input wicket:id="enable" type="checkbox"> Enable</label></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.htmlsimilarity index 67%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.htmlindex bb343efd9c..12147e9fa0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.html@@ -1,24 +1,21 @@<wicket:extend><div class="page-title">Tag Protection</div>+ <div class="help-block">Define tag protection rules</div><div wicket:id="tagProtectionSetting" class="panel-list"><ul class="list-unstyled protections"><li wicket:id="protections" class="protection"><div wicket:id="protection"></div></li></ul><div wicket:id="newProtection"></div>- <div class="help-block">- <i class="fa fa-info-circle"></i> Specify tag protection rule here. For a given tag and submitter combination,- the first matching protection rule will be used- </div></div><wicket:fragment wicket:id="editNewFrag"><div class="protection panel panel-default">- <div class="panel-heading"><div class="panel-title">Edit Protection</div></div>+ <div class="panel-heading"><div class="panel-title">Edit Rule</div></div><div class="panel-body"><div wicket:id="editor"></div></div></div></wicket:fragment><wicket:fragment wicket:id="addNewLinkFrag">- <a wicket:id="link" class="add-new"><i class="fa fa-plus-circle fa-lg"></i> Add Protection</a>+ <a wicket:id="link" class="add-new"><i class="fa fa-plus-circle fa-lg"></i> Add Rule</a></wicket:fragment></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.javasimilarity index 94%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.javarename to server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.javaindex 2e6be54059..b7ed372ab4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.java@@ -20,11 +20,11 @@ import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.page.project.setting.ProjectSettingPage;@SuppressWarnings("serial")-public class TagProtectionPage extends ProjectSettingPage {+public class TagProtectionsPage extends ProjectSettingPage {private WebMarkupContainer container;- public TagProtectionPage(PageParameters params) {+ public TagProtectionsPage(PageParameters params) {super(params);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/ProjectWebHooksPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/ProjectWebHooksPage.htmlnew file mode 100644index 0000000000..62147d849a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/ProjectWebHooksPage.html@@ -0,0 +1,16 @@+<wicket:extend>+ <div class="page-title">Web Hooks</div>+ <div class="help-block">+ OneDev will post event data in JSON format to specified URLs when subscribed events happen+ </div>+ <div class="panel panel-default">+ <div class="panel-heading"><b>Project Specific</b></div>+ <div wicket:id="projectSpecificWebHooks" class="panel-body"></div>+ </div>+ <div class="panel panel-default">+ <div class="panel-heading"><b>Inherited from <a wicket:id="owner">Owner</a></b></div>+ <div class="panel-body">+ <div wicket:id="inheritedWebHooks"></div>+ </div>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/ProjectWebHooksPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/ProjectWebHooksPage.javanew file mode 100644index 0000000000..fdcd2c10eb--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/ProjectWebHooksPage.java@@ -0,0 +1,46 @@+package io.onedev.server.web.page.project.setting.webhook;++import java.util.ArrayList;++import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.support.WebHook;+import io.onedev.server.web.component.link.SettingInOwnerLink;+import io.onedev.server.web.component.webhook.WebHookListPanel;+import io.onedev.server.web.component.webhook.WebHooksBean;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.page.admin.user.webhook.UserWebHooksPage;+import io.onedev.server.web.page.my.webhook.MyWebHooksPage;+import io.onedev.server.web.page.project.setting.ProjectSettingPage;++@SuppressWarnings("serial")+public class ProjectWebHooksPage extends ProjectSettingPage {++ public ProjectWebHooksPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ WebHooksBean bean = new WebHooksBean();+ bean.setWebHooks(getProject().getWebHooks());+ add(new WebHookListPanel("projectSpecificWebHooks", bean) {++ @Override+ protected void onSaved(ArrayList<WebHook> webHooks) {+ getProject().setWebHooks(webHooks);+ OneDev.getInstance(ProjectManager.class).save(getProject());+ setResponsePage(ProjectWebHooksPage.class, ProjectWebHooksPage.paramsOf(getProject()));+ }++ });++ add(PropertyContext.view("inheritedWebHooks", getProject().getOwner(), "webHooks"));+ add(new SettingInOwnerLink("owner", projectModel, UserWebHooksPage.class, MyWebHooksPage.class));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHookCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHookCssResourceReference.javadeleted file mode 100644index 8001e5466e..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHookCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.page.project.setting.webhook;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class WebHookCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public WebHookCssResourceReference() {- super(WebHookCssResourceReference.class, "web-hook.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/web-hook.css b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/web-hook.cssdeleted file mode 100644index 890384afcc..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/web-hook.css+++ /dev/null@@ -1,9 +0,0 @@-.web-hook.list table thead th {- font-weight: bold !important;-}-.web-hook.list table thead th.property-eventTypes {- width: 25%;-}-.web-hook.list table .select2-container {- width: 100%;-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.javaindex 50864c7a9b..a071b14157 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java@@ -242,7 +242,7 @@ public class ProjectTagsPage extends ProjectPage {} else {Project project = getProject();TagProtection protection = project.getTagProtection(tagName, getLoginUser());- if (protection != null && protection.isNoCreation()) {+ if (protection.isNoCreation()) {form.error("Unable to create protected tag");target.focusComponent(nameInput);target.add(form);@@ -392,12 +392,10 @@ public class ProjectTagsPage extends ProjectPage {super.onConfigure();Project project = getProject();- if (SecurityUtils.canWriteCode(project)) {- TagProtection protection = project.getTagProtection(tagName, getLoginUser());- setEnabled(protection == null || !protection.isNoDeletion());- } else {+ if (SecurityUtils.canWriteCode(project))+ setEnabled(!project.getTagProtection(tagName, getLoginUser()).isNoDeletion());+ elsesetVisible(false);- }}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.javaindex d7418a31c2..5b55eb08f4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java@@ -19,7 +19,7 @@ import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.editable.Path;import io.onedev.server.web.page.base.BasePage;-import io.onedev.server.web.page.my.MyAvatarPage;+import io.onedev.server.web.page.my.avatar.MyAvatarPage;import io.onedev.server.web.page.project.ProjectListPage;@SuppressWarnings("serial")