The Unified and Autonomous Development Platform
Fix issue #576 - Able to specify custom service desk email address of a project
Robin Shen303c508a00e2
diff --git a/readme.md b/readme.mdindex 473f736a87..9e4fb356cc 100644--- a/readme.md+++ b/readme.md@@ -64,7 +64,7 @@ Queries can be saved and subscribed, so that you won't miss anything interested.## A Full-fledge CI/CD Engine without Writing Yaml-OneDev ships with GUI to generate CI/CD Yaml. No need to google around for Yaml grammars. A one-liner docker command to start OneDev server and you have a local CI/CD runner automatically. Concerns about server capability to run massive jobs? Another one-liner to connect self-updating agent from any machine. Want auto-scale up/down CI/CD farm? A helm one-liner to deploy OneDev into k8s cluster.+OneDev ships with GUI to generate CI/CD Yaml. No need to google around for Yaml grammars. A one-liner docker command to start OneDev server and you have a local CI/CD runner automatically. Concerns about server capability to run massive jobs? Another one-liner to connect self-updating agent from any machine. Want auto-scale CI/CD farm? A helm one-liner to deploy OneDev into k8s cluster.Matrix jobs, typed parameters, parameter chaining, step templates, build promotions… too many neat features to elaborate here…diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Import.java b/server-core/src/main/java/io/onedev/server/buildspec/Import.javaindex ec19824e82..997be853f5 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/Import.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/Import.java@@ -99,7 +99,7 @@ public class Import implements Serializable, Validatable {private static Project getInputProject() {String projectPath = (String) EditContext.get().getInputValue("projectPath");if (projectPath != null) {- Project project = OneDev.getInstance(ProjectManager.class).find(projectPath);+ Project project = OneDev.getInstance(ProjectManager.class).findByPath(projectPath);if (project != null && SecurityUtils.canReadCode(project))return project;}@@ -254,7 +254,7 @@ public class Import implements Serializable, Validatable {}public Project getProject() {- Project project = OneDev.getInstance(ProjectManager.class).find(projectPath);+ Project project = OneDev.getInstance(ProjectManager.class).findByPath(projectPath);if (project == null)throw new ExplicitException("Unable to find project to import build spec: " + projectPath);elsediff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.javaindex 19d49b076b..71beac00e4 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java@@ -353,7 +353,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizfor (ProjectDependency dependency: build.getJob().getProjectDependencies()) {dependency = interpolator.interpolateProperties(dependency);- Project dependencyProject = projectManager.find(dependency.getProjectPath());+ Project dependencyProject = projectManager.findByPath(dependency.getProjectPath());if (dependencyProject == null)throw new ExplicitException("Unable to find dependency project: " + dependency.getProjectPath());diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.javaindex b9e9ab1a8d..e4e5557d76 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java@@ -80,7 +80,7 @@ public class ProjectDependency implements Serializable {static Project getInputProject(EditContext editContext) {String projectPath = (String) editContext.getInputValue("projectPath");if (projectPath != null) {- Project project = OneDev.getInstance(ProjectManager.class).find(projectPath);+ Project project = OneDev.getInstance(ProjectManager.class).findByPath(projectPath);if (project != null && SecurityUtils.canReadCode(project))return project;}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.javaindex 3026e1d85d..67260499ea 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java@@ -19,7 +19,10 @@ import io.onedev.server.util.criteria.Criteria;public interface ProjectManager extends EntityManager<Project> {@Nullable- Project find(String path);+ Project findByPath(String path);++ @Nullable+ Project findByServiceDeskName(String serviceDeskName);Project initialize(String path);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 2b07bf66d0..844a7b9fac 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -379,7 +379,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Buiif (term.contains("#")) {String projectPath = StringUtils.substringBefore(term, "#");- Project specifiedProject = projectManager.find(projectPath);+ Project specifiedProject = projectManager.findByPath(projectPath);if (specifiedProject != null && SecurityUtils.canAccess(specifiedProject)) {project = specifiedProject;term = StringUtils.substringAfter(term, "#");diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex 74c3ee961f..3965ae58e9 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -749,7 +749,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Isspublic List<Issue> query(EntityQuery<Issue> scope, Project project, String term, int count) {if (term.contains("#")) {String projectPath = StringUtils.substringBefore(term, "#");- Project specifiedProject = projectManager.find(projectPath);+ Project specifiedProject = projectManager.findByPath(projectPath);if (specifiedProject != null && SecurityUtils.canAccess(specifiedProject)) {project = specifiedProject;term = StringUtils.substringAfter(term, "#");diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.javaindex 4b67b537bf..b66ded16ee 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java@@ -32,7 +32,7 @@ public class DefaultMilestoneManager extends BaseEntityManager<Milestone> implem@Overridepublic Milestone findInHierarchy(String milestoneFQN) {String projectName = StringUtils.substringBefore(milestoneFQN, ":");- Project project = projectManager.find(projectName);+ Project project = projectManager.findByPath(projectName);if (project != null) {String milestoneName = StringUtils.substringAfter(milestoneFQN, ":");EntityCriteria<Milestone> criteria = EntityCriteria.of(Milestone.class);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex d1bd41aaab..e99bdf2bad 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -363,7 +363,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>@Sessional@Override- public Project find(String path) {+ public Project findByPath(String path) {List<String> names = Splitter.on("/").omitEmptyStrings().trimResults().splitToList(path);Project project = null;for (String name: names) {@@ -374,6 +374,15 @@ public class DefaultProjectManager extends BaseEntityManager<Project>return project;}+ @Sessional+ @Override+ public Project findByServiceDeskName(String serviceDeskName) {+ EntityCriteria<Project> criteria = newCriteria();+ criteria.add(Restrictions.ilike(Project.PROP_SERVICE_DESK_NAME, serviceDeskName));+ criteria.setCacheable(true);+ return find(criteria);+ }+@Sessional@Overridepublic Project initialize(String path) {@@ -402,8 +411,8 @@ public class DefaultProjectManager extends BaseEntityManager<Project>Project parent = project.getParent();while (parent != null && parent.isNew()) {- parent.setCodeManagementEnabled(false);- parent.setIssueManagementEnabled(false);+ parent.setCodeManagement(false);+ parent.setIssueManagement(false);parent = parent.getParent();}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 7e5d6f5e52..48e0a42234 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@@ -1023,7 +1023,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> imif (term.contains("#")) {String projectPath = StringUtils.substringBefore(term, "#");- Project specifiedProject = projectManager.find(projectPath);+ Project specifiedProject = projectManager.findByPath(projectPath);if (specifiedProject != null && SecurityUtils.canAccess(specifiedProject)) {project = specifiedProject;term = StringUtils.substringAfter(term, "#");diff --git a/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.javaindex afb21c4636..cba11d741d 100644--- a/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java+++ b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java@@ -75,7 +75,7 @@ public class ReferenceParser {Project referenceProject;if (referenceProjectName != null) {- referenceProject = OneDev.getInstance(ProjectManager.class).find(referenceProjectName);+ referenceProject = OneDev.getInstance(ProjectManager.class).findByPath(referenceProjectName);referenceText += referenceProjectName;} else {referenceProject = project;diff --git a/server-core/src/main/java/io/onedev/server/git/GitFilter.java b/server-core/src/main/java/io/onedev/server/git/GitFilter.javaindex 0179044f52..86383ce35e 100644--- a/server-core/src/main/java/io/onedev/server/git/GitFilter.java+++ b/server-core/src/main/java/io/onedev/server/git/GitFilter.java@@ -100,10 +100,10 @@ public class GitFilter implements Filter {throws IOException {String projectPath = StringUtils.strip(projectInfo, "/");- Project project = projectManager.find(projectPath);+ Project project = projectManager.findByPath(projectPath);if (project == null && projectPath.startsWith("projects/")) {projectPath = projectPath.substring("projects/".length());- project = projectManager.find(projectPath);+ project = projectManager.findByPath(projectPath);}if (project == null)throw new GitException(String.format("Unable to find project '%s'", projectPath));diff --git a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.javaindex d3cd76045b..45af7da44c 100644--- a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java+++ b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java@@ -151,7 +151,7 @@ public class GitLfsFilter implements Filter {LfsObjectAccess lfsObjectAccess = null;sessionManager.openSession();try {- Project project = Preconditions.checkNotNull(projectManager.find(getProjectPath(pathInfo)));+ Project project = Preconditions.checkNotNull(projectManager.findByPath(getProjectPath(pathInfo)));String objectId = StringUtils.substringAfterLast(pathInfo, "/");if (canReadCode(httpRequest, project))lfsObjectAccess = new LfsObjectAccess(project.getLfsObjectFile(objectId), project.getLfsObjectLock(objectId).readLock());@@ -177,7 +177,7 @@ public class GitLfsFilter implements Filter {LfsObjectAccess lfsObjectAccess = null;sessionManager.openSession();try {- Project project = Preconditions.checkNotNull(projectManager.find(getProjectPath(pathInfo)));+ Project project = Preconditions.checkNotNull(projectManager.findByPath(getProjectPath(pathInfo)));if (SecurityUtils.canWriteCode(project))lfsObjectAccess = new LfsObjectAccess(project.getLfsObjectFile(objectId), project.getLfsObjectLock(objectId).writeLock());else@@ -212,7 +212,7 @@ public class GitLfsFilter implements Filter {sessionManager.openSession();try {String projectPath = getProjectPath(pathInfo);- Project project = projectManager.find(projectPath);+ Project project = projectManager.findByPath(projectPath);if (project == null) {sendBatchError(httpResponse, SC_NOT_FOUND,"Project not found: " + projectPath);diff --git a/server-core/src/main/java/io/onedev/server/git/GitSshCommand.java b/server-core/src/main/java/io/onedev/server/git/GitSshCommand.javaindex dae5329a71..bed87b64ee 100644--- a/server-core/src/main/java/io/onedev/server/git/GitSshCommand.java+++ b/server-core/src/main/java/io/onedev/server/git/GitSshCommand.java@@ -94,10 +94,10 @@ abstract class GitSshCommand implements Command, ServerSessionAware {ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);String projectPath = StringUtils.substringAfter(command, "'/");projectPath = StringUtils.substringBefore(projectPath, "'");- Project project = projectManager.find(projectPath);+ Project project = projectManager.findByPath(projectPath);if (project == null && projectPath.startsWith("projects/")) {projectPath = projectPath.substring("projects/".length());- project = projectManager.find(projectPath);+ project = projectManager.findByPath(projectPath);}if (project == null) {onExit(-1, "Unable to find project '" + projectPath + "'");diff --git a/server-core/src/main/java/io/onedev/server/git/LfsAuthenticateCommand.java b/server-core/src/main/java/io/onedev/server/git/LfsAuthenticateCommand.javaindex 5720b0feee..3f40cce611 100644--- a/server-core/src/main/java/io/onedev/server/git/LfsAuthenticateCommand.java+++ b/server-core/src/main/java/io/onedev/server/git/LfsAuthenticateCommand.java@@ -100,7 +100,7 @@ public class LfsAuthenticateCommand implements Command, ServerSessionAware {try {String accessToken = OneDev.getInstance(UserManager.class).load(userId).getAccessToken();String projectName = StringUtils.substringBefore(command.substring(COMMAND_PREFIX.length()+1), " ");- Project project = OneDev.getInstance(ProjectManager.class).find(projectName);+ Project project = OneDev.getInstance(ProjectManager.class).findByPath(projectName);if (project == null)throw new ExplicitException("Project not found: " + projectName);String url = OneDev.getInstance(UrlManager.class).cloneUrlFor(project, false);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 55bc69263d..f3205b05d8 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@@ -3555,7 +3555,14 @@ public class DataMigrator {}}for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("PullRequestChanges.xml")) {+ if (file.getName().startsWith("Projects.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ element.element("issueManagementEnabled").setName("issueManagement");+ element.element("codeManagementEnabled").setName("codeManagement");+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("PullRequestChanges.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element: dom.getRootElement().elements()) {Element dataElement = element.element("data");@@ -3584,5 +3591,5 @@ public class DataMigrator {}}}-+}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 7941441287..d8970cf75d 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@@ -192,15 +192,20 @@ public class Project extends AbstractEntity {public static final String PROP_GROUP_AUTHORIZATIONS = "groupAuthorizations";- public static final String PROP_CODE_MANAGEMENT_ENABLED = "codeManagementEnabled";+ public static final String PROP_CODE_MANAGEMENT = "codeManagement";- public static final String PROP_ISSUE_MANAGEMENT_ENABLED = "issueManagementEnabled";+ public static final String PROP_ISSUE_MANAGEMENT = "issueManagement";++ public static final String NAME_SERVICE_DESK_NAME = "Service Desk Name";++ public static final String PROP_SERVICE_DESK_NAME = "serviceDeskName";public static final List<String> QUERY_FIELDS =- Lists.newArrayList(NAME_NAME, NAME_PATH, NAME_DESCRIPTION, NAME_UPDATE_DATE);+ Lists.newArrayList(NAME_NAME, NAME_PATH, NAME_SERVICE_DESK_NAME, NAME_DESCRIPTION, NAME_UPDATE_DATE);public static final Map<String, String> ORDER_FIELDS = CollectionUtils.newLinkedHashMap(NAME_NAME, PROP_NAME,+ NAME_SERVICE_DESK_NAME, PROP_SERVICE_DESK_NAME,NAME_UPDATE_DATE, PROP_UPDATE_DATE);private static final int LAST_COMMITS_CACHE_THRESHOLD = 1000;@@ -317,9 +322,12 @@ public class Project extends AbstractEntity {@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<Milestone> milestones = new ArrayList<>();- private boolean codeManagementEnabled = true;+ private boolean codeManagement = true;- private boolean issueManagementEnabled = true;+ private boolean issueManagement = true;++ @Column(unique=true)+ private String serviceDeskName;@JsonIgnore@Lob@@ -658,7 +666,7 @@ public class Project extends AbstractEntity {}public ProjectFacade getFacade() {- return new ProjectFacade(getId(), getName(), Project.idOf(getParent()));+ return new ProjectFacade(getId(), getName(), getServiceDeskName(), Project.idOf(getParent()));}/**@@ -1130,24 +1138,33 @@ public class Project extends AbstractEntity {this.codeComments = codeComments;}- @Editable(order=250, name="Code Management", description="Whether or not to enable code management for the project")- public boolean isCodeManagementEnabled() {- return codeManagementEnabled;+ @Editable(order=250, description="Whether or not to enable code management for the project")+ public boolean isCodeManagement() {+ return codeManagement;}- public void setCodeManagementEnabled(boolean codeManagementEnabled) {- this.codeManagementEnabled = codeManagementEnabled;+ public void setCodeManagement(boolean codeManagement) {+ this.codeManagement = codeManagement;}- @Editable(order=300, name="Issue management", description="Whether or not to enable issue management for the project")- public boolean isIssueManagementEnabled() {- return issueManagementEnabled;+ @Editable(order=300, description="Whether or not to enable issue management for the project")+ public boolean isIssueManagement() {+ return issueManagement;}- public void setIssueManagementEnabled(boolean issueManagementEnabled) {- this.issueManagementEnabled = issueManagementEnabled;+ public void setIssueManagement(boolean issueManagement) {+ this.issueManagement = issueManagement;}+ @Nullable+ public String getServiceDeskName() {+ return serviceDeskName;+ }++ public void setServiceDeskName(String serviceDeskName) {+ this.serviceDeskName = serviceDeskName;+ }+public ProjectIssueSetting getIssueSetting() {return issueSetting;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.javaindex e6650cf5e5..a74fcf69be 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java@@ -22,7 +22,9 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResoimport io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;+import io.onedev.server.web.editable.annotation.Editable;+@Editablepublic class ProjectIssueSetting implements Serializable {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.javaindex fab1e40c97..5b20b0a3bf 100644--- a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java@@ -343,7 +343,7 @@ public class DefaultMailManager implements MailManager {if (serviceDeskSetting != null) {if (designatedProject == null)throw new ExplicitException("No project designated for sender: " + from.getAddress());- Project project = projectManager.find(designatedProject);+ Project project = projectManager.findByPath(designatedProject);if (project == null) {String errorMessage = String.format("Sender project does not exist (sender: %s, project: %s)",@@ -356,89 +356,83 @@ public class DefaultMailManager implements MailManager {throw new ExplicitException("Unable to create issue from email as service desk is not enabled");}} else if (receiverAddress.getDomain().equals(systemAddress.getDomain())- && receiverAddress.getPrefix().startsWith(systemAddress.getPrefix() + "+")) {- String subAddress = receiverAddress.getPrefix().substring(systemAddress.getPrefix().length()+1);- String projectName = StringUtils.substringBefore(subAddress, "~");- if (projectName.equals(MailManager.TEST_SUB_ADDRESSING))+ && receiverAddress.getName().startsWith(systemAddress.getName() + "+")) {+ String subAddress = receiverAddress.getName().substring(systemAddress.getName().length()+1);+ if (subAddress.equals(MailManager.TEST_SUB_ADDRESS)) {continue;- Project project = projectManager.find(projectName);- if (project == null)- throw new ExplicitException("Non-existent project specified in receipient address: " + receiverAddress);-- String remaining = StringUtils.substringAfter(subAddress, "~");- if (remaining.length() == 0) {- if (serviceDeskSetting != null) {- checkPermission(from, project, new AccessProject(), user, authorization);- issues.add(openIssue(message, project, from, user, authorization));- } else {- throw new ExplicitException("Unable to create issue from email as service desk is not enabled");- }- } else if (remaining.startsWith("issue")) {- remaining = remaining.substring("issue".length());- Long issueNumber;+ } else if (subAddress.contains("~")) {+ Long entityId;try {- issueNumber = Long.valueOf(StringUtils.substringBefore(remaining, "~"));+ entityId = Long.parseLong(StringUtils.substringAfter(subAddress, "~"));} catch (NumberFormatException e) {- throw new ExplicitException("Invalid issue number specified in receipient address: " + receiverAddress);+ throw new ExplicitException("Invalid id specified in receipient address: " + receiverAddress);}- Issue issue = issueManager.find(project, issueNumber);- if (issue == null)- throw new ExplicitException("Non-existent issue specified in receipient address: " + receiverAddress);- if (remaining.contains("~")) {- if (user != null) {- IssueWatch watch = issueWatchManager.find(issue, user);- if (watch != null) {- watch.setWatching(false);- issueWatchManager.save(watch);- String subject = "Unsubscribed successfully from issue " + issue.getFQN();- String body = "You will no longer receive notifications of issue " + issue.getFQN() + " unless mentioned. "- + "However if you subscribed to certain issue queries, you may still get notifications of newly "- + "created issues matching those queries. In this case, you will need to login to your account "- + "and unsubscribe those queries.";- sendMailAsync(Lists.newArrayList(from.getAddress()), Lists.newArrayList(), Lists.newArrayList(),- subject, body, body, null, getMessageId(message));+ if (subAddress.contains("issue")) {+ Issue issue = issueManager.get(entityId);+ if (issue == null)+ throw new ExplicitException("Non-existent issue specified in receipient address: " + receiverAddress);+ if (subAddress.contains("unsubscribe")) {+ if (user != null) {+ IssueWatch watch = issueWatchManager.find(issue, user);+ if (watch != null) {+ watch.setWatching(false);+ issueWatchManager.save(watch);+ String subject = "Unsubscribed successfully from issue " + issue.getFQN();+ String body = "You will no longer receive notifications of issue " + issue.getFQN() + " unless mentioned. "+ + "However if you subscribed to certain issue queries, you may still get notifications of newly "+ + "created issues matching those queries. In this case, you will need to login to your account "+ + "and unsubscribe those queries.";+ sendMailAsync(Lists.newArrayList(from.getAddress()), Lists.newArrayList(), Lists.newArrayList(),+ subject, body, body, null, getMessageId(message));+ }}+ } else {+ checkPermission(from, issue.getProject(), new AccessProject(), user, authorization);+ addComment(issue, message, from, receiverEmailAddresses, user, authorization);+ issues.add(issue);}- } else {- checkPermission(from, project, new AccessProject(), user, authorization);- addComment(issue, message, from, receiverEmailAddresses, user, authorization);- issues.add(issue);- }- } else if (remaining.startsWith("pullrequest")) {- remaining = remaining.substring("pullrequest".length());- Long pullRequestNumber;- try {- pullRequestNumber = Long.valueOf(StringUtils.substringBefore(remaining, "~"));- } catch (NumberFormatException e) {- throw new ExplicitException("Invalid pull request number specified in receipient address: " + receiverAddress);- }- PullRequest pullRequest = pullRequestManager.find(project, pullRequestNumber);- if (pullRequest == null)- throw new ExplicitException("Non-existent pull request specified in receipient address: " + receiverAddress);-- if (remaining.contains("~")) {- if (user != null) {- PullRequestWatch watch = pullRequestWatchManager.find(pullRequest, user);- if (watch != null) {- watch.setWatching(false);- pullRequestWatchManager.save(watch);- String subject = "Unsubscribed successfully from pull request " + pullRequest.getFQN();- String body = "You will no longer receive notifications of pull request " + pullRequest.getFQN()- + " unless mentioned. However if you subscribed to certain pull request queries, you may still "- + "get notifications of newly submitted pull request matching those queries. In this case, you "- + "will need to login to your account and unsubscribe those queries.";- sendMailAsync(Lists.newArrayList(from.getAddress()), Lists.newArrayList(), Lists.newArrayList(),- subject, body, body, null, getMessageId(message));+ } else if (subAddress.contains("pullrequest")) {+ PullRequest pullRequest = pullRequestManager.get(entityId);+ if (pullRequest == null)+ throw new ExplicitException("Non-existent pull request specified in receipient address: " + receiverAddress);+ if (subAddress.contains("unsubscribe")) {+ if (user != null) {+ PullRequestWatch watch = pullRequestWatchManager.find(pullRequest, user);+ if (watch != null) {+ watch.setWatching(false);+ pullRequestWatchManager.save(watch);+ String subject = "Unsubscribed successfully from pull request " + pullRequest.getFQN();+ String body = "You will no longer receive notifications of pull request " + pullRequest.getFQN()+ + " unless mentioned. However if you subscribed to certain pull request queries, you may still "+ + "get notifications of newly submitted pull request matching those queries. In this case, you "+ + "will need to login to your account and unsubscribe those queries.";+ sendMailAsync(Lists.newArrayList(from.getAddress()), Lists.newArrayList(), Lists.newArrayList(),+ subject, body, body, null, getMessageId(message));+ }}+ } else {+ checkPermission(from, pullRequest.getTargetProject(), new ReadCode(), user, authorization);+ addComment(pullRequest, message, from, receiverEmailAddresses, user, authorization);+ pullRequests.add(pullRequest);}} else {- checkPermission(from, project, new ReadCode(), user, authorization);- addComment(pullRequest, message, from, receiverEmailAddresses, user, authorization);- pullRequests.add(pullRequest);+ throw new ExplicitException("Invalid receipient address: " + receiverAddress);}} else {- throw new ExplicitException("Invalid receipient address: " + receiverAddress);- }+ Project project = projectManager.findByServiceDeskName(subAddress);+ if (project == null)+ project = projectManager.findByPath(subAddress);++ if (project == null)+ throw new ExplicitException("Non-existent project specified in receipient address: " + receiverAddress);+ if (serviceDeskSetting != null) {+ checkPermission(from, project, new AccessProject(), user, authorization);+ logger.debug("Creating issue via email (project: {})...", project.getPath());+ issues.add(openIssue(message, project, from, user, authorization));+ } else {+ throw new ExplicitException("Unable to create issue from email as service desk is not enabled");+ }+ }} else {involved.add(receiver);}@@ -637,7 +631,7 @@ public class DefaultMailManager implements MailManager {User user = userManager.findByEmail(address.getAddress());if (user == null) {user = new User();- user.setName(UserNameValidator.suggestUserName(EmailAddress.parse(address.getAddress()).getPrefix()));+ user.setName(UserNameValidator.suggestUserName(EmailAddress.parse(address.getAddress()).getName()));user.setEmail(address.getAddress());user.setFullName(address.getPersonal());user.setPassword("impossible password");@@ -853,8 +847,7 @@ public class DefaultMailManager implements MailManager {MailSetting mailSetting = settingManager.getMailSetting();if (mailSetting != null && mailSetting.getReceiveMailSetting() != null) {EmailAddress systemAddress = EmailAddress.parse(mailSetting.getEmailAddress());- return systemAddress.getPrefix() + "+" + issue.getProject().getPath() + "~issue" + issue.getNumber()- + "@" + systemAddress.getDomain();+ return systemAddress.getSubAddressed("issue~" + issue.getId());} else {return null;}@@ -865,8 +858,7 @@ public class DefaultMailManager implements MailManager {MailSetting mailSetting = settingManager.getMailSetting();if (mailSetting != null && mailSetting.getReceiveMailSetting() != null) {EmailAddress systemAddress = EmailAddress.parse(mailSetting.getEmailAddress());- return systemAddress.getPrefix() + "+" + request.getProject().getPath() + "~pullrequest" + request.getNumber()- + "@" + systemAddress.getDomain();+ return systemAddress.getSubAddressed("pullrequest~" + request.getId());} else {return null;}@@ -877,8 +869,7 @@ public class DefaultMailManager implements MailManager {MailSetting mailSetting = settingManager.getMailSetting();if (mailSetting != null && mailSetting.getReceiveMailSetting() != null) {EmailAddress systemAddress = EmailAddress.parse(mailSetting.getEmailAddress());- return systemAddress.getPrefix() + "+" + issue.getProject().getPath() + "~issue" + issue.getNumber() + "~unsubscribe"- + "@" + systemAddress.getDomain();+ return systemAddress.getSubAddressed("issueunsubscribe~" + issue.getId());} else {return null;}@@ -889,8 +880,7 @@ public class DefaultMailManager implements MailManager {MailSetting mailSetting = settingManager.getMailSetting();if (mailSetting != null && mailSetting.getReceiveMailSetting() != null) {EmailAddress systemAddress = EmailAddress.parse(mailSetting.getEmailAddress());- return systemAddress.getPrefix() + "+" + request.getProject().getPath() + "~pullrequest" + request.getNumber() + "~unsubscribe"- + "@" + systemAddress.getDomain();+ return systemAddress.getSubAddressed("pullrequestunsubscribe~" + request.getId());} else {return null;}diff --git a/server-core/src/main/java/io/onedev/server/notification/MailManager.java b/server-core/src/main/java/io/onedev/server/notification/MailManager.javaindex f9a7ed89c5..9e5fa28dc9 100644--- a/server-core/src/main/java/io/onedev/server/notification/MailManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/MailManager.java@@ -12,7 +12,7 @@ import io.onedev.server.model.support.administration.ReceiveMailSetting;public interface MailManager {- public static final String TEST_SUB_ADDRESSING = "test-sub-addressing";+ public static final String TEST_SUB_ADDRESS = "test~subaddressing";void sendMail(Collection<String> toList, Collection<String> ccList,Collection<String> bccList, String subject, String htmlBody,diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.javaindex a1c5d1aafd..ba2362db14 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java@@ -74,7 +74,7 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa}public static Project getProject(String projectPath) {- Project project = OneDev.getInstance(ProjectManager.class).find(projectPath);+ Project project = OneDev.getInstance(ProjectManager.class).findByPath(projectPath);if (project == null)throw new ExplicitException("Unable to find project '" + projectPath + "'");return project;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.javaindex 84422aeb1c..610accb542 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java@@ -126,6 +126,8 @@ public class ProjectQuery extends EntityQuery<Project> {case ProjectQueryLexer.Is:if (fieldName.equals(Project.NAME_NAME))return new NameCriteria(value);+ else if (fieldName.equals(Project.NAME_SERVICE_DESK_NAME))+ return new ServiceDeskNameCriteria(value);elsereturn new PathCriteria(value);case ProjectQueryLexer.Contains:@@ -198,8 +200,11 @@ public class ProjectQuery extends EntityQuery<Project> {throw newOperatorException(fieldName, operator);break;case ProjectQueryLexer.Is:- if (!fieldName.equals(Project.NAME_NAME) && !fieldName.equals(Project.NAME_PATH))+ if (!fieldName.equals(Project.NAME_NAME)+ && !fieldName.equals(Project.NAME_SERVICE_DESK_NAME)+ && !fieldName.equals(Project.NAME_PATH)) {throw newOperatorException(fieldName, operator);+ }break;case ProjectQueryLexer.IsUntil:case ProjectQueryLexer.IsSince:diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskNameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskNameCriteria.javanew file mode 100644index 0000000000..3c429f9e37--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskNameCriteria.java@@ -0,0 +1,41 @@+package io.onedev.server.search.entity.project;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.match.WildcardUtils;++public class ServiceDeskNameCriteria extends Criteria<Project> {++ private static final long serialVersionUID = 1L;++ private final String value;++ public ServiceDeskNameCriteria(String value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {+ Path<String> attribute = from.get(Project.PROP_SERVICE_DESK_NAME);+ return builder.like(builder.lower(attribute), value.replace("*", "%"));+ }++ @Override+ public boolean matches(Project project) {+ return project.getServiceDeskName() != null && WildcardUtils.matchString(value, project.getServiceDeskName());+ }++ @Override+ public String toStringWithoutParens() {+ return Criteria.quote(Project.NAME_NAME) + " "+ + ProjectQuery.getRuleName(ProjectQueryLexer.Is) + " "+ + Criteria.quote(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/EmailAddress.java b/server-core/src/main/java/io/onedev/server/util/EmailAddress.javaindex cf7dc53b21..2e31e16849 100644--- a/server-core/src/main/java/io/onedev/server/util/EmailAddress.java+++ b/server-core/src/main/java/io/onedev/server/util/EmailAddress.java@@ -8,17 +8,17 @@ public class EmailAddress implements Serializable {private static final long serialVersionUID = 1L;- private final String prefix;+ private final String name;private final String domain;- public EmailAddress(String prefix, String domain) {- this.prefix = prefix;+ public EmailAddress(String name, String domain) {+ this.name = name;this.domain = domain;}- public String getPrefix() {- return prefix;+ public String getName() {+ return name;}public String getDomain() {@@ -26,14 +26,18 @@ public class EmailAddress implements Serializable {}public static EmailAddress parse(String emailAddress) {- String prefix = StringUtils.substringBefore(emailAddress, "@");+ String name = StringUtils.substringBefore(emailAddress, "@");String domain = StringUtils.substringAfter(emailAddress, "@");- return new EmailAddress(prefix, domain);+ return new EmailAddress(name, domain);}@Overridepublic String toString() {- return prefix + "@" + domain;+ return name + "@" + domain;+ }++ public String getSubAddressed(String subAddress) {+ return name + "+" + subAddress + "@" + domain;}}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/util/ProjectScopedNumber.java b/server-core/src/main/java/io/onedev/server/util/ProjectScopedNumber.javaindex 203ed6a7a1..e401468a4e 100644--- a/server-core/src/main/java/io/onedev/server/util/ProjectScopedNumber.java+++ b/server-core/src/main/java/io/onedev/server/util/ProjectScopedNumber.java@@ -24,7 +24,7 @@ public class ProjectScopedNumber {if (fqn.contains("#")) {String projectName = StringUtils.substringBefore(fqn, "#");if (projectName.length() != 0) {- Project project = OneDev.getInstance(ProjectManager.class).find(projectName);+ Project project = OneDev.getInstance(ProjectManager.class).findByPath(projectName);if (project != null) {String numberStr = StringUtils.substringAfter(fqn, "#");try {diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectScopedRevision.java b/server-core/src/main/java/io/onedev/server/util/ProjectScopedRevision.javaindex 2ac173579c..9d5c3ddfc6 100644--- a/server-core/src/main/java/io/onedev/server/util/ProjectScopedRevision.java+++ b/server-core/src/main/java/io/onedev/server/util/ProjectScopedRevision.java@@ -34,7 +34,7 @@ public class ProjectScopedRevision implements Serializable {public static ProjectScopedRevision from(String revisionFQN) {String projectName = StringUtils.substringBefore(revisionFQN, ":");String revision = StringUtils.substringAfter(revisionFQN, ":");- Project project = OneDev.getInstance(ProjectManager.class).find(projectName);+ Project project = OneDev.getInstance(ProjectManager.class).findByPath(projectName);if (project != null)return new ProjectScopedRevision(project, revision);elsediff --git a/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.javaindex 52e989de6a..46e236c97f 100644--- a/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java+++ b/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java@@ -8,11 +8,14 @@ public class ProjectFacade extends EntityFacade {private final String name;+ private final String serviceDeskName;+private final Long parentId;- public ProjectFacade(Long id, String name, @Nullable Long parentId) {+ public ProjectFacade(Long id, String name, @Nullable String serviceDeskName, @Nullable Long parentId) {super(id);this.name = name;+ this.serviceDeskName = serviceDeskName;this.parentId = parentId;}@@ -20,6 +23,11 @@ public class ProjectFacade extends EntityFacade {return name;}+ @Nullable+ public String getServiceDeskName() {+ return serviceDeskName;+ }+@Nullablepublic Long getParentId() {return parentId;diff --git a/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.javaindex f68281d020..ac855e59cd 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java@@ -5,7 +5,6 @@ import java.util.regex.Pattern;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;-import io.onedev.server.notification.MailManager;import io.onedev.server.util.validation.annotation.ProjectName;public class ProjectNameValidator implements ConstraintValidator<ProjectName, String> {@@ -33,7 +32,7 @@ public class ProjectNameValidator implements ConstraintValidator<ProjectName, St}constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;- } else if (value.equals("new") || value.equals("import") || value.equals(MailManager.TEST_SUB_ADDRESSING)) {+ } else if (value.equals("new") || value.equals("import")) {constraintContext.disableDefaultConstraintViolation();String message = this.message;if (message.length() == 0)diff --git a/server-core/src/main/java/io/onedev/server/util/validation/ProjectPathValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/ProjectPathValidator.javaindex 00dbb04dd8..968d0e128f 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/ProjectPathValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/ProjectPathValidator.java@@ -5,7 +5,6 @@ import java.util.regex.Pattern;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;-import io.onedev.server.notification.MailManager;import io.onedev.server.util.validation.annotation.ProjectPath;public class ProjectPathValidator implements ConstraintValidator<ProjectPath, String> {@@ -33,7 +32,7 @@ public class ProjectPathValidator implements ConstraintValidator<ProjectPath, St}constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;- } else if (value.equals("new") || value.equals("import") || value.equals(MailManager.TEST_SUB_ADDRESSING)) {+ } else if (value.equals("new") || value.equals("import")) {constraintContext.disableDefaultConstraintViolation();String message = this.message;if (message.length() == 0)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 45590ff6bd..4b22eff407 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@@ -113,6 +113,7 @@ import io.onedev.server.web.page.project.setting.build.DefaultFixedIssueFiltersPimport io.onedev.server.web.page.project.setting.build.JobSecretsPage;import io.onedev.server.web.page.project.setting.general.GeneralProjectSettingPage;import io.onedev.server.web.page.project.setting.pluginsettings.ContributedProjectSettingPage;+import io.onedev.server.web.page.project.setting.servicedesk.ProjectServiceDeskSettingPage;import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionsPage;import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;import io.onedev.server.web.page.project.stats.ProjectContribsPage;@@ -327,6 +328,7 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new DynamicPathPageMapper("projects/${project}/settings/build/action-authorizations", ActionAuthorizationsPage.class));add(new DynamicPathPageMapper("projects/${project}/settings/build/build-preserve-rules", BuildPreservationsPage.class));add(new DynamicPathPageMapper("projects/${project}/settings/build/default-fixed-issues-filter", DefaultFixedIssueFiltersPage.class));+ add(new DynamicPathPageMapper("projects/${project}/settings/service-desk", ProjectServiceDeskSettingPage.class));add(new DynamicPathPageMapper("projects/${project}/settings/web-hooks", WebHooksPage.class));add(new DynamicPathPageMapper("projects/${project}/settings/${setting}", ContributedProjectSettingPage.class));}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.javaindex 800857b65c..109a05d3da 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java@@ -1,7 +1,10 @@package io.onedev.server.web.behavior;+import static io.onedev.server.search.entity.project.ProjectQuery.getRuleName;+import java.util.ArrayList;import java.util.List;+import java.util.stream.Collectors;import org.apache.commons.lang3.StringUtils;@@ -15,13 +18,15 @@ import io.onedev.commons.codeassist.parser.Element;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.Project;import io.onedev.server.search.entity.project.ProjectQuery;-import static io.onedev.server.search.entity.project.ProjectQuery.getRuleName;import io.onedev.server.search.entity.project.ProjectQueryLexer;import io.onedev.server.search.entity.project.ProjectQueryParser;+import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.DateUtils;-import io.onedev.server.OneDev;-import io.onedev.server.model.Project;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -48,9 +53,14 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {List<String> candidates = new ArrayList<>(Project.QUERY_FIELDS);if (childQuery)candidates.remove(Project.NAME_PATH);+ if (OneDev.getInstance(SettingManager.class).getServiceDeskSetting() == null)+ candidates.remove(Project.NAME_SERVICE_DESK_NAME);return SuggestionUtils.suggest(candidates, matchWith);} else if ("orderField".equals(spec.getLabel())) {- return SuggestionUtils.suggest(new ArrayList<>(Project.ORDER_FIELDS.keySet()), matchWith);+ List<String> candidates = new ArrayList<>(Project.ORDER_FIELDS.keySet());+ if (OneDev.getInstance(SettingManager.class).getServiceDeskSetting() == null)+ candidates.remove(Project.NAME_SERVICE_DESK_NAME);+ return SuggestionUtils.suggest(candidates, matchWith);} else if ("criteriaValue".equals(spec.getLabel())) {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);@@ -78,6 +88,19 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {return SuggestionUtils.suggestProjects(matchWith);elsereturn null;+ } else if (fieldName.equals(Project.NAME_SERVICE_DESK_NAME)) {+ if (!matchWith.contains("*")) {+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);+ List<String> serviceDeskNames = projectManager.getPermittedProjects(new AccessProject())+ .stream()+ .filter(it->it.getServiceDeskName() != null)+ .map(it->it.getServiceDeskName())+ .sorted()+ .collect(Collectors.toList());+ return SuggestionUtils.suggest(serviceDeskNames, matchWith);+ } else {+ return null;+ }} else {return null;}@@ -131,7 +154,7 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);if (!fieldElements.isEmpty()) {String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());- if (fieldName.equals(Project.NAME_NAME)) {+ if (fieldName.equals(Project.NAME_NAME) || fieldName.equals(Project.NAME_SERVICE_DESK_NAME)) {hints.add("Use '*' for wildcard match");} else if (fieldName.equals(Project.NAME_DESCRIPTION)) {hints.add("Use '*' for wildcard match");diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.javaindex ec31ba1cb8..dbd3b0dc41 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java@@ -43,7 +43,7 @@ public abstract class ReferenceInputBehavior extends InputAssistBehavior {String projectName = matcher.group(4);Project project;if (projectName != null)- project = OneDev.getInstance(ProjectManager.class).find(projectName);+ project = OneDev.getInstance(ProjectManager.class).findByPath(projectName);elseproject = getProject();if (project != null) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex 6921b2d9e7..adf646536a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -434,7 +434,7 @@ public abstract class IssueListPanel extends Panel {List<Project> projects = new ArrayList<>(OneDev.getInstance(ProjectManager.class).getPermittedProjects(new AccessProject()));- Predicate<Project> issueManagementEnabledPredicate = item -> item.isIssueManagementEnabled();+ Predicate<Project> issueManagementEnabledPredicate = item -> item.isIssueManagement();CollectionUtils.filter(projects, issueManagementEnabledPredicate);Collections.sort(projects, new Comparator<Project>() {@@ -1010,7 +1010,7 @@ public abstract class IssueListPanel extends Panel {List<Project> projects = new ArrayList<>(OneDev.getInstance(ProjectManager.class).getPermittedProjects(new AccessProject()));- Predicate<Project> issueManagementEnabledPredicate = item -> item.isIssueManagementEnabled();+ Predicate<Project> issueManagementEnabledPredicate = item -> item.isIssueManagement();CollectionUtils.filter(projects, issueManagementEnabledPredicate);projects.remove(getProject());diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.javaindex 672611989a..f2709b71a1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java@@ -362,7 +362,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {List<Map<String, String>> referenceList = new ArrayList<>();Project referenceProject;if (StringUtils.isNotBlank(referenceProjectName))- referenceProject = OneDev.getInstance(ProjectManager.class).find(referenceProjectName);+ referenceProject = OneDev.getInstance(ProjectManager.class).findByPath(referenceProjectName);elsereferenceProject = null;if (referenceProject != null || StringUtils.isBlank(referenceProjectName)) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.javaindex 3d7c4ef8f5..862411a10d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.java@@ -1,7 +1,7 @@package io.onedev.server.web.component.project.info;import static io.onedev.server.model.Project.PROP_DESCRIPTION;-import static io.onedev.server.model.Project.PROP_ISSUE_MANAGEMENT_ENABLED;+import static io.onedev.server.model.Project.PROP_ISSUE_MANAGEMENT;import static io.onedev.server.model.Project.PROP_NAME;import java.util.Collection;@@ -53,7 +53,7 @@ abstract class ForkOptionPanel extends Panel {ParentBean parentBean = new ParentBean();String userName = SecurityUtils.getUser().getName();- Project parent = getProjectManager().find(userName);+ Project parent = getProjectManager().findByPath(userName);if (parent != null) {if (SecurityUtils.canCreateChildren(parent))parentBean.setParentPath(parent.getPath());@@ -64,7 +64,7 @@ abstract class ForkOptionPanel extends Panel {DefaultRoleBean defaultRoleBean = new DefaultRoleBean();defaultRoleBean.setRole(getProject().getDefaultRole());- Collection<String> properties = Sets.newHashSet(PROP_NAME, PROP_DESCRIPTION, PROP_ISSUE_MANAGEMENT_ENABLED);+ Collection<String> properties = Sets.newHashSet(PROP_NAME, PROP_DESCRIPTION, PROP_ISSUE_MANAGEMENT);BeanEditor editor = BeanContext.edit("editor", editProject, properties, false);BeanEditor defaultRoleEditor = BeanContext.edit("defaultRoleEditor", defaultRoleBean);@@ -95,7 +95,7 @@ abstract class ForkOptionPanel extends Panel {} else {newProject.setForkedFrom(getProject());newProject.setDescription(editProject.getDescription());- newProject.setIssueManagementEnabled(editProject.isIssueManagementEnabled());+ newProject.setIssueManagement(editProject.isIssueManagement());newProject.setDefaultRole(defaultRoleBean.getRole());getProjectManager().fork(getProject(), newProject);Session.get().success("Project forked");diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.htmlindex 51e66782fc..2214c97287 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html@@ -14,6 +14,12 @@<a wicket:id="forkNow" class="btn btn-sm btn-light btn-hover-primary btn-icon" title="Fork now"><wicket:svg href="fork" class="icon"/></a></div></div>+ <wicket:enclosure child="serviceDesk">+ <div class="mt-2">+ <a wicket:id="serviceDesk"><wicket:svg href="mail" class="icon"></wicket:svg> <span wicket:id="label"></span></a>+ <div class="font-size-sm mt-1 text-muted">Issues can be created in this project by sending email to this address</div>+ </div>+ </wicket:enclosure><div wicket:id="description" class="mt-4"></div></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.javaindex 86297c8a78..05b0197c52 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java@@ -15,10 +15,13 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.search.entity.project.ProjectQueryLexer;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.EmailAddress;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.component.markdown.MarkdownViewer;import io.onedev.server.web.component.modal.ModalLink;@@ -43,7 +46,7 @@ public abstract class ProjectInfoPanel extends Panel {add(new ProjectPathPanel("path", projectModel));WebMarkupContainer forkInfo = new WebMarkupContainer("forkInfo");- forkInfo.setVisible(getProject().isCodeManagementEnabled());+ forkInfo.setVisible(getProject().isCodeManagement());add(forkInfo);String query = ProjectQuery.getRuleName(ProjectQueryLexer.ForksOf) + " "@@ -60,7 +63,7 @@ public abstract class ProjectInfoPanel extends Panel {};forksLink.add(new Label("label", getProject().getForks().size() + " forks"));- forksLink.setVisible(getProject().isCodeManagementEnabled());+ forksLink.setVisible(getProject().isCodeManagement());forkInfo.add(forksLink);forkInfo.add(new ModalLink("forkNow") {@@ -89,6 +92,39 @@ public abstract class ProjectInfoPanel extends Panel {}}.setVisible(SecurityUtils.canReadCode(getProject()) && SecurityUtils.canCreateProjects()));++ SettingManager settingManager = OneDev.getInstance(SettingManager.class);+ if (settingManager.getServiceDeskSetting() != null+ && settingManager.getMailSetting() != null+ && settingManager.getMailSetting().getReceiveMailSetting() != null+ && getProject().isIssueManagement()) {++ String subAddressed;++ EmailAddress emailAddress = EmailAddress.parse(settingManager.getMailSetting().getEmailAddress());+ if (getProject().getServiceDeskName() != null)+ subAddressed = emailAddress.getSubAddressed(getProject().getServiceDeskName());+ else+ subAddressed = emailAddress.getSubAddressed(getProject().getPath());++ add(new WebMarkupContainer("serviceDesk") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("label", subAddressed));+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.put("href", "mailto:" + subAddressed);+ }++ });+ } else {+ add(new WebMarkupContainer("serviceDesk").setVisible(false));+ }if (getProject().getDescription() != null)add(new MarkdownViewer("description", Model.of(getProject().getDescription()), null));diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex 5fbed5133e..ed77455741 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -460,7 +460,7 @@ public class ProjectListPanel extends Panel {errorMessage = "Project manage privilege required to modify '" + eachProject + "'";break;} else {- Project projectWithSameName = getProjectManager().find(eachProject.getName());+ Project projectWithSameName = getProjectManager().findByPath(eachProject.getName());if (projectWithSameName != null && !projectWithSameName.equals(eachProject)) {errorMessage = "A root project with name '" + eachProject.getName() + "' already exists";break;@@ -720,7 +720,7 @@ public class ProjectListPanel extends Panel {errorMessage = "Project manage privilege required to modify '" + eachProject + "'";break;} else {- Project projectWithSameName = getProjectManager().find(eachProject.getName());+ Project projectWithSameName = getProjectManager().findByPath(eachProject.getName());if (projectWithSameName != null && !projectWithSameName.equals(eachProject)) {errorMessage = "A root project with name '" + eachProject.getName() + "' already exists";break;@@ -1062,7 +1062,7 @@ public class ProjectListPanel extends Panel {fragment.add(new Label("lastUpdate", "Updated " + DateUtils.formatAge(project.getUpdateDate())));int commitCount;- if (project.isCodeManagementEnabled() && SecurityUtils.canReadCode(project)+ if (project.isCodeManagement() && SecurityUtils.canReadCode(project)&& (commitCount=OneDev.getInstance(CommitInfoManager.class).getCommitCount(project)) != 0) {Fragment commitInfoFrag = new Fragment("codeInfo", "codeInfoFrag", ProjectListPanel.this);PageParameters params = ProjectCommitsPage.paramsOf(project, null);@@ -1177,7 +1177,7 @@ public class ProjectListPanel extends Panel {fragment.add(new WebMarkupContainer("pullRequestInfo").setVisible(false));}- if (project.isIssueManagementEnabled()) {+ if (project.isIssueManagement()) {IModel<Integer> totalCountModel = new LoadableDetachableModel<Integer>() {@Override@@ -1256,7 +1256,7 @@ public class ProjectListPanel extends Panel {fragment.add(new WebMarkupContainer("issueInfo").setVisible(false));}- if (project.isCodeManagementEnabled()) {+ if (project.isCodeManagement()) {IModel<Integer> totalCountModel = new LoadableDetachableModel<Integer>() {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.javaindex f6f76dd384..9d31ba805d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java@@ -52,7 +52,7 @@ public class ProjectMultiChoiceEditor extends PropertyEditor<List<String>> {if (getModelObject() != null) {ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);for (String projectPath: getModelObject()) {- Project project = projectManager.find(projectPath);+ Project project = projectManager.findByPath(projectPath);if (project != null && choicesModel.getObject().contains(project))selections.add(project);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.javaindex 83cf39c35f..fd2d75f2eb 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java@@ -36,7 +36,7 @@ public class ProjectSingleChoiceEditor extends PropertyEditor<String> {Project project;if (getModelObject() != null)- project = OneDev.getInstance(ProjectManager.class).find(getModelObject());+ project = OneDev.getInstance(ProjectManager.class).findByPath(getModelObject());elseproject = null;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.javaindex ea870090cc..c741742ffd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.java@@ -55,7 +55,7 @@ public class GroupAuthorizationsPage extends GroupPage {projectPaths.add(authorizationBean.getProjectPath());GroupAuthorization authorization = new GroupAuthorization();authorization.setGroup(getGroup());- authorization.setProject(OneDev.getInstance(ProjectManager.class).find(authorizationBean.getProjectPath()));+ authorization.setProject(OneDev.getInstance(ProjectManager.class).findByPath(authorizationBean.getProjectPath()));authorization.setRole(OneDev.getInstance(RoleManager.class).find(authorizationBean.getRoleName()));authorizations.add(authorization);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.javaindex a017a093ec..c38414fd90 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java@@ -125,8 +125,7 @@ public class MailSettingPage extends AdministrationPage {mailSetting.getTimeout(), listener));EmailAddress emailAddress = EmailAddress.parse(mailSetting.getEmailAddress());- String subAddressed = emailAddress.getPrefix() + "+"- + MailManager.TEST_SUB_ADDRESSING + "@" + emailAddress.getDomain();+ String subAddressed = emailAddress.getSubAddressed(MailManager.TEST_SUB_ADDRESS);logger.log("Sending test mail to " + subAddressed + "...");mailManager.sendMail(mailSetting,Sets.newHashSet(subAddressed), Lists.newArrayList(), Lists.newArrayList(), uuid,diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.javaindex a3f625480b..ed2a0d158c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.java@@ -55,7 +55,7 @@ public class UserAuthorizationsPage extends UserPage {projectNames.add(authorizationBean.getProjectPath());UserAuthorization authorization = new UserAuthorization();authorization.setUser(getUser());- authorization.setProject(OneDev.getInstance(ProjectManager.class).find(authorizationBean.getProjectPath()));+ authorization.setProject(OneDev.getInstance(ProjectManager.class).findByPath(authorizationBean.getProjectPath()));authorization.setRole(OneDev.getInstance(RoleManager.class).find(authorizationBean.getRoleName()));authorizations.add(authorization);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.javaindex 1718542ac3..97fafa05df 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java@@ -1,8 +1,8 @@package io.onedev.server.web.page.project;-import static io.onedev.server.model.Project.PROP_CODE_MANAGEMENT_ENABLED;+import static io.onedev.server.model.Project.PROP_CODE_MANAGEMENT;import static io.onedev.server.model.Project.PROP_DESCRIPTION;-import static io.onedev.server.model.Project.PROP_ISSUE_MANAGEMENT_ENABLED;+import static io.onedev.server.model.Project.PROP_ISSUE_MANAGEMENT;import static io.onedev.server.model.Project.PROP_NAME;import java.util.Collection;@@ -50,7 +50,7 @@ public class NewProjectPage extends LayoutPage {Project editProject = new Project();Collection<String> properties = Sets.newHashSet(PROP_NAME, PROP_DESCRIPTION,- PROP_CODE_MANAGEMENT_ENABLED, PROP_ISSUE_MANAGEMENT_ENABLED);+ PROP_CODE_MANAGEMENT, PROP_ISSUE_MANAGEMENT);DefaultRoleBean defaultRoleBean = new DefaultRoleBean();ParentBean parentBean = new ParentBean();@@ -78,16 +78,16 @@ public class NewProjectPage extends LayoutPage {"This name has already been used by another project");} else {newProject.setDescription(editProject.getDescription());- newProject.setCodeManagementEnabled(editProject.isCodeManagementEnabled());- newProject.setIssueManagementEnabled(editProject.isIssueManagementEnabled());+ newProject.setCodeManagement(editProject.isCodeManagement());+ newProject.setIssueManagement(editProject.isIssueManagement());newProject.setDefaultRole(defaultRoleBean.getRole());getProjectManager().create(newProject);Session.get().success("New project created");- if (newProject.isCodeManagementEnabled())+ if (newProject.isCodeManagement())setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(newProject));- else if (newProject.isIssueManagementEnabled())+ else if (newProject.isIssueManagement())setResponsePage(ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(newProject));elsesetResponsePage(ProjectChildrenPage.class, ProjectChildrenPage.paramsOf(newProject));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 912125427b..649265a201 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@@ -24,6 +24,7 @@ import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;@@ -68,6 +69,7 @@ import io.onedev.server.web.page.project.setting.build.DefaultFixedIssueFiltersPimport io.onedev.server.web.page.project.setting.build.JobSecretsPage;import io.onedev.server.web.page.project.setting.general.GeneralProjectSettingPage;import io.onedev.server.web.page.project.setting.pluginsettings.ContributedProjectSettingPage;+import io.onedev.server.web.page.project.setting.servicedesk.ProjectServiceDeskSettingPage;import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionsPage;import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;import io.onedev.server.web.page.project.stats.ProjectContribsPage;@@ -143,7 +145,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {List<SidebarMenuItem> menuItems = new ArrayList<>();- if (getProject().isCodeManagementEnabled() && SecurityUtils.canReadCode(getProject())) {+ if (getProject().isCodeManagement() && SecurityUtils.canReadCode(getProject())) {List<SidebarMenuItem> codeMenuItems = new ArrayList<>();codeMenuItems.add(new SidebarMenuItem.Page(null, "Files",@@ -165,7 +167,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {menuItems.add(new SidebarMenuItem.SubMenu("git", "Code", codeMenuItems));}- if (getProject().isIssueManagementEnabled()) {+ if (getProject().isIssueManagement()) {List<SidebarMenuItem> issueMenuItems = new ArrayList<>();issueMenuItems.add(new SidebarMenuItem.Page(null, "List",@@ -180,7 +182,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {menuItems.add(new SidebarMenuItem.SubMenu("bug", "Issues", issueMenuItems));}- if (getProject().isCodeManagementEnabled()) {+ if (getProject().isCodeManagement()) {menuItems.add(new SidebarMenuItem.Page("play-circle", "Builds",ProjectBuildsPage.class, ProjectBuildsPage.paramsOf(getProject(), 0),Lists.newArrayList(BuildDetailPage.class, InvalidBuildPage.class)));@@ -188,7 +190,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {List<SidebarMenuItem> statsMenuItems = new ArrayList<>();- if (getProject().isCodeManagementEnabled() && SecurityUtils.canReadCode(getProject())) {+ if (getProject().isCodeManagement() && SecurityUtils.canReadCode(getProject())) {statsMenuItems.add(new SidebarMenuItem.Page(null, "Contributions",ProjectContribsPage.class, ProjectContribsPage.paramsOf(getProject())));statsMenuItems.add(new SidebarMenuItem.Page(null, "Source Lines",@@ -215,6 +217,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {AvatarEditPage.class, AvatarEditPage.paramsOf(getProject())));settingMenuItems.add(new SidebarMenuItem.Page(null, "Authorizations",ProjectAuthorizationsPage.class, ProjectAuthorizationsPage.paramsOf(getProject())));+settingMenuItems.add(new SidebarMenuItem.Page(null, "Branch Protection",BranchProtectionsPage.class, BranchProtectionsPage.paramsOf(getProject())));settingMenuItems.add(new SidebarMenuItem.Page(null, "Tag Protection",@@ -232,6 +235,12 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {DefaultFixedIssueFiltersPage.class, DefaultFixedIssueFiltersPage.paramsOf(getProject())));settingMenuItems.add(new SidebarMenuItem.SubMenu(null, "Build Setting", buildSettingMenuItems));++ if (OneDev.getInstance(SettingManager.class).getServiceDeskSetting() != null && getProject().isIssueManagement()) {+ settingMenuItems.add(new SidebarMenuItem.Page(null, "Service Desk Setting",+ ProjectServiceDeskSettingPage.class, ProjectServiceDeskSettingPage.paramsOf(getProject())));+ }+settingMenuItems.add(new SidebarMenuItem.Page(null, "Web Hooks",WebHooksPage.class, WebHooksPage.paramsOf(getProject())));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.javaindex 55167b11b6..0ca6888c52 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.java@@ -20,9 +20,9 @@ public class ProjectDashboardPage extends ProjectPage {super(params);PageProvider pageProvider;- if (getProject().isCodeManagementEnabled() && SecurityUtils.canReadCode(getProject()))+ if (getProject().isCodeManagement() && SecurityUtils.canReadCode(getProject()))pageProvider = new PageProvider(ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject()));- else if (getProject().isIssueManagementEnabled())+ else if (getProject().isIssueManagement())pageProvider = new PageProvider(ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(getProject()));elsepageProvider = new PageProvider(ProjectChildrenPage.class, ProjectChildrenPage.paramsOf(getProject()));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.javaindex c3c44f4038..b5bc3fb343 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java@@ -43,7 +43,7 @@ public class NewIssuePage extends ProjectPage implements InputContext, ScriptIdepublic NewIssuePage(PageParameters params) {super(params);- if (!getProject().isIssueManagementEnabled())+ if (!getProject().isIssueManagement())throw new ExplicitException("Issue management not enabled in this project");User currentUser = getLoginUser();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.javaindex e4825723d9..64daa72276 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java@@ -1,8 +1,8 @@package io.onedev.server.web.page.project.setting.general;-import static io.onedev.server.model.Project.PROP_CODE_MANAGEMENT_ENABLED;+import static io.onedev.server.model.Project.PROP_CODE_MANAGEMENT;import static io.onedev.server.model.Project.PROP_DESCRIPTION;-import static io.onedev.server.model.Project.PROP_ISSUE_MANAGEMENT_ENABLED;+import static io.onedev.server.model.Project.PROP_ISSUE_MANAGEMENT;import static io.onedev.server.model.Project.PROP_NAME;import java.io.Serializable;@@ -50,7 +50,7 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {super.onInitialize();Collection<String> properties = Sets.newHashSet(PROP_NAME, PROP_DESCRIPTION,- PROP_CODE_MANAGEMENT_ENABLED, PROP_ISSUE_MANAGEMENT_ENABLED);+ PROP_CODE_MANAGEMENT, PROP_ISSUE_MANAGEMENT);DefaultRoleBean defaultRoleBean = new DefaultRoleBean();defaultRoleBean.setRole(getProject().getDefaultRole());@@ -103,7 +103,7 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {String parentError = null;if (!Objects.equal(prevParentPath, parentBean.getParentPath())) {if (parentBean.getParentPath() != null) {- Project parent = getProjectManager().find(parentBean.getParentPath());+ Project parent = getProjectManager().findByPath(parentBean.getParentPath());if (parent == null)parentError = "Parent project not found";else if (project.isSelfOrAncestorOf(parent))diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ProjectServiceDeskSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ProjectServiceDeskSettingPage.htmlnew file mode 100644index 0000000000..4b07131f11--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ProjectServiceDeskSettingPage.html@@ -0,0 +1,10 @@+<wicket:extend>+ <div class="card">+ <div class="card-body">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="editor"></div>+ <input class="btn btn-primary dirty-aware" value="Update" type="submit">+ </form>+ </div>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ProjectServiceDeskSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ProjectServiceDeskSettingPage.javanew file mode 100644index 0000000000..3bf95d86fe--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ProjectServiceDeskSettingPage.java@@ -0,0 +1,66 @@+package io.onedev.server.web.page.project.setting.servicedesk;++import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Project;+import io.onedev.server.util.Path;+import io.onedev.server.util.PathNode;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.page.project.setting.ProjectSettingPage;++@SuppressWarnings("serial")+public class ProjectServiceDeskSettingPage extends ProjectSettingPage {++ private BeanEditor editor;++ public ProjectServiceDeskSettingPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ ServiceDeskSettingBean bean = new ServiceDeskSettingBean();+ bean.setServiceDeskName(getProject().getServiceDeskName());+ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);+ if (bean.getServiceDeskName() != null) {+ Project projectWithSameServiceDeskName = projectManager.findByServiceDeskName(bean.getServiceDeskName());+ if (projectWithSameServiceDeskName != null && !projectWithSameServiceDeskName.equals(getProject())) {+ editor.error(new Path(new PathNode.Named(ServiceDeskSettingBean.PROP_SERVICE_DESK_NAME)),+ "This service desk name has already been used by another project");+ }+ }+ if (editor.isValid()) {+ getProject().setServiceDeskName(bean.getServiceDeskName());+ projectManager.save(getProject());+ setResponsePage(ProjectServiceDeskSettingPage.class, ProjectServiceDeskSettingPage.paramsOf(getProject()));+ Session.get().success("Service desk setting updated");+ }+ }++ };+ form.add(editor = BeanContext.edit("editor", bean));++ add(form);+ }++ @Override+ protected Component newProjectTitle(String componentId) {+ return new Label(componentId, "<span class='text-truncate'>Service Desk Setting</span>").setEscapeModelStrings(false);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ServiceDeskSettingBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ServiceDeskSettingBean.javanew file mode 100644index 0000000000..2ff40827fe--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ServiceDeskSettingBean.java@@ -0,0 +1,31 @@+package io.onedev.server.web.page.project.setting.servicedesk;++import java.io.Serializable;++import io.onedev.server.util.validation.annotation.ProjectName;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;++@Editable+public class ServiceDeskSettingBean implements Serializable {++ private static final long serialVersionUID = 1L;++ static final String PROP_SERVICE_DESK_NAME = "serviceDeskName";++ private String serviceDeskName;++ @Editable(order=100, description="Service desk name can be used to construct service desk email address of current project, "+ + "which takes the form <tt><system email address name>+<service desk name>@<system email address domain></tt>. "+ + "Issues can be created in this project by sending email to this address")+ @ProjectName+ @NameOfEmptyValue("Use project path")+ public String getServiceDeskName() {+ return serviceDeskName;+ }++ public void setServiceDeskName(String serviceDeskName) {+ this.serviceDeskName = serviceDeskName;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex fc01aba835..90133776a4 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -334,7 +334,7 @@ public class SuggestionUtils {if (matchWith.contains(scopeSeparator)) {String projectName = StringUtils.substringBefore(matchWith, scopeSeparator);matchWith = StringUtils.substringAfter(matchWith, scopeSeparator);- project = projectManager.find(projectName);+ project = projectManager.findByPath(projectName);if (project != null) {List<InputSuggestion> projectScopedSuggestions = projectScopedSuggester.suggest(project, matchWith);if (projectScopedSuggestions != null) {diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaProjectImporter.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaProjectImporter.javaindex 26825dcb05..3646bce53e 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaProjectImporter.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaProjectImporter.java@@ -81,7 +81,7 @@ public class GiteaProjectImporter extends ProjectImporter<ImportServer, ProjectIProject project = projectManager.initialize(projectMapping.getOneDevProject());Preconditions.checkState(project.isNew());project.setDescription(repoNode.get("description").asText(null));- project.setIssueManagementEnabled(repoNode.get("has_issues").asBoolean());+ project.setIssueManagement(repoNode.get("has_issues").asBoolean());boolean isPrivate = repoNode.get("private").asBoolean();if (!isPrivate && how.getPublicRole() != null)diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImporter.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImporter.javaindex 9abf316fa7..93dd9abb5f 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImporter.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImporter.java@@ -57,7 +57,7 @@ public class GitHubProjectImporter extends ProjectImporter<ImportServer, ProjectProject project = projectManager.initialize(projectMapping.getOneDevProject());Preconditions.checkState(project.isNew());project.setDescription(repoNode.get("description").asText(null));- project.setIssueManagementEnabled(repoNode.get("has_issues").asBoolean());+ project.setIssueManagement(repoNode.get("has_issues").asBoolean());boolean isPrivate = repoNode.get("private").asBoolean();if (!isPrivate && how.getPublicRole() != null)diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabProjectImporter.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabProjectImporter.javaindex c807b005c3..055a40bad5 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabProjectImporter.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabProjectImporter.java@@ -86,7 +86,7 @@ public class GitLabProjectImporter extends ProjectImporter<ImportServer, ProjectProject project = projectManager.initialize(projectMapping.getOneDevProject());Preconditions.checkState(project.isNew());project.setDescription(projectNode.get("description").asText(null));- project.setIssueManagementEnabled(projectNode.get("issues_enabled").asBoolean());+ project.setIssueManagement(projectNode.get("issues_enabled").asBoolean());String visibility = projectNode.get("visibility").asText();if (!visibility.equals("private") && how.getPublicRole() != null)diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImporter.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImporter.javaindex fa861b58a3..031aa35970 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImporter.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImporter.java@@ -63,7 +63,7 @@ public class YouTrackProjectImporter extends ProjectImporter<ImportServer, ProjeProject project = projectManager.initialize(projectMapping.getOneDevProject());Preconditions.checkState(project.isNew());project.setDescription(youTrackProjectDescriptions.get(projectMapping.getYouTrackProject()));- project.setIssueManagementEnabled(true);+ project.setIssueManagement(true);if (!dryRun) {projectManager.create(project);