The Unified and Autonomous Development Platform
Some minor improvements
Robin Shen4cc9c3155f49
diff --git a/server-core/pom.xml b/server-core/pom.xmlindex 57da628261..3209df26a0 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -325,7 +325,7 @@<dependency><groupId>io.onedev</groupId><artifactId>k8s-helper</artifactId>- <version>1.0.14</version>+ <version>1.0.15</version></dependency></dependencies><properties>diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java b/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.javaindex 07e929bc85..8b78214369 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java@@ -20,7 +20,7 @@ public class EnvVar implements Serializable {private String value;@Editable(order=100, description="Specify name of the environment variable. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@VariableName(interpolative = true)@NotEmpty@@ -33,7 +33,7 @@ public class EnvVar implements Serializable {}@Editable(order=200, description="Specify value of the environment variable. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getValue() {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex c867900c7e..64c0736222 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -124,7 +124,7 @@ public class Job implements Serializable, Validatable {}@Editable(order=110, description="Specify docker image of the job. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getImage() {@@ -162,9 +162,9 @@ public class Job implements Serializable, Validatable {}@Editable(order=120, name="Commands", description="Specify content of Linux shell script or Windows command batch to execute in above image. "- + "It will be executed under <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>, which may contain files of your repository and "+ + "It will be executed under <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>, which may contain files of your repository and "+ "dependency artifacts based on your configuration below. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative@Code(language = Code.SHELL, variableProvider="getVariables")@Size(min=1, message="may not be empty")@@ -210,7 +210,7 @@ public class Job implements Serializable, Validatable {}@Editable(order=9000, group="Source Retrieval", description="Whether or not to retrieve files under the repository "- + "into <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>")+ + "into <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>")public boolean isRetrieveSource() {return retrieveSource;}@@ -280,8 +280,8 @@ public class Job implements Serializable, Validatable {}@Editable(order=9115, group="Artifacts & Reports", description="Optionally specify files to publish as job artifacts. "- + "Artifact files are relative to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>, and may use * or ? for pattern match. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "Artifact files are relative to <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>, and may use * or ? for pattern match. "+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@Patterns(interpolative = true)@NameOfEmptyValue("No artifacts")@@ -338,7 +338,7 @@ public class Job implements Serializable, Validatable {@Editable(order=9200, name="CPU Requirement", group="Resource Requirements", description="Specify CPU requirement of the job. "+ "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu' target='_blank'>kubernetes documentation</a> for details. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getCpuRequirement() {@@ -351,7 +351,7 @@ public class Job implements Serializable, Validatable {@Editable(order=9300, group="Resource Requirements", description="Specify memory requirement of the job. "+ "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory' target='_blank'>kubernetes documentation</a> for details. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getMemoryRequirement() {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.javaindex ee586af587..1da5fc2c8d 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java@@ -69,8 +69,8 @@ public class JobDependency implements Serializable {}@Editable(order=300, name="Artifacts to Retrieve", description="Optionally specify artifacts to retrieve "- + "from the dependency into <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>. Leave empty to do not retrieve any artifacts. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "from the dependency into <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>. Leave empty to do not retrieve any artifacts. "+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@Patterns(interpolative = true)@NameOfEmptyValue("Do not retrieve")diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.javaindex 9b58f97fa1..b880c0f562 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java@@ -24,7 +24,7 @@ public abstract class JobReport implements Serializable {private transient PatternSet patternSet;@Editable(order=100, description="Specify files relative to OneDev workspace. Use * or ? for pattern match. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@Patterns(interpolative = true)@NotEmptydiff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobService.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobService.javaindex 873b385bc4..ffbca0e829 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobService.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobService.java@@ -31,7 +31,7 @@ public class JobService implements Serializable {private String memoryRequirement = "128m";@Editable(order=100, description="Specify name of the service, which will be used as host name to access "- + "the service. <b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "the service. <b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@DnsName(interpolative = true)@NotEmpty@@ -44,7 +44,7 @@ public class JobService implements Serializable {}@Editable(order=200, description="Specify docker image of the service. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getImage() {@@ -56,7 +56,7 @@ public class JobService implements Serializable {}@Editable(order=220, description="Optionally specify arguments to run above image. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")public String getArguments() {return arguments;@@ -79,7 +79,7 @@ public class JobService implements Serializable {@Editable(order=400, description="Specify command to check readiness of the service. This command will "+ "be interpretated by cmd.exe on Windows images, and by shell on Linux images. It will be "+ "executed repeatedly until a zero code is returned to indicate service ready. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getReadinessCheckCommand() {@@ -92,7 +92,7 @@ public class JobService implements Serializable {@Editable(order=10000, name="CPU Requirement", group="More Settings", description="Specify CPU requirement of the job. "+ "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu' target='_blank'>kubernetes documentation</a> for details. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getCpuRequirement() {@@ -105,7 +105,7 @@ public class JobService implements Serializable {@Editable(order=10100, group="More Settings", description="Specify memory requirement of the job. "+ "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory' target='_blank'>kubernetes documentation</a> for details. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getMemoryRequirement() {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.javaindex eba8594786..95984a75e6 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java@@ -68,7 +68,7 @@ public class ProjectDependency implements Serializable {}@Editable(order=300, name="Build", description="Specify build to retrieve artifacts from. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables", literalSuggester="suggestBuilds")@NotEmptypublic String getBuildNumber() {@@ -99,8 +99,8 @@ public class ProjectDependency implements Serializable {return new ArrayList<>();}- @Editable(order=400, name="Artifacts to Retrieve", description="Specify artifacts to retrieve into <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ @Editable(order=400, name="Artifacts to Retrieve", description="Specify artifacts to retrieve into <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>. "+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@Patterns(suggester="suggestArtifacts", interpolative=true)@NotEmptydiff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CloseMilestoneAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CloseMilestoneAction.javaindex 58451d15ca..e12234a601 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CloseMilestoneAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CloseMilestoneAction.java@@ -24,7 +24,7 @@ public class CloseMilestoneAction extends PostBuildAction {private String milestoneName;@Editable(order=1000, description="Specify name of the milestone. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getMilestoneName() {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.javaindex 914707eb0c..9f8f8ad304 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java@@ -41,7 +41,7 @@ public class CreateIssueAction extends PostBuildAction {private List<FieldSupply> issueFields = new ArrayList<>();@Editable(order=1000, name="Title", group="Issue Detail", description="Specify title of the issue. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getIssueTitle() {@@ -53,7 +53,7 @@ public class CreateIssueAction extends PostBuildAction {}@Editable(order=1050, name="Description", group="Issue Detail", description="Optionally specify description of the issue. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Multiline@Interpolative(variableSuggester="suggestVariables")public String getIssueDescription() {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.javaindex 450ec12f68..08a4bc4da4 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.java@@ -28,7 +28,7 @@ public class CreateTagAction extends PostBuildAction {private String tagMessage;@Editable(order=1000, description="Specify name of the tag. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getTagName() {@@ -40,7 +40,7 @@ public class CreateTagAction extends PostBuildAction {}@Editable(order=1050, description="Optionally specify message of the tag. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Multiline@Interpolative(variableSuggester="suggestVariables")public String getTagMessage() {diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex aa16e1f628..2b0db6a858 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -112,8 +112,6 @@ public class Build extends AbstractEntity implements Referenceable {public static final String PROP_PROJECT = "project";- public static final String FIELD_PROJECT_OWNER = "Project Owner";-public static final String FIELD_JOB = "Job";public static final String PROP_JOB = "jobName";@@ -176,7 +174,7 @@ public class Build extends AbstractEntity implements Referenceable {FIELD_PROJECT, FIELD_NUMBER, FIELD_JOB, FIELD_STATUS, FIELD_SUBMITTER, FIELD_CANCELLER,FIELD_SUBMIT_DATE, FIELD_PENDING_DATE, FIELD_RUNNING_DATE, FIELD_FINISH_DATE,FIELD_COMMIT, FIELD_VERSION, FIELD_DEPENDENCIES, FIELD_DEPENDENTS, FIELD_ERROR_MESSAGE,- FIELD_LOG, FIELD_PROJECT_OWNER, FIELD_IMAGE);+ FIELD_LOG, FIELD_IMAGE);public static final List<String> QUERY_FIELDS = Lists.newArrayList(FIELD_PROJECT, FIELD_JOB, FIELD_NUMBER, FIELD_VERSION, FIELD_COMMIT, FIELD_SUBMIT_DATE,diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.javaindex 4c04415848..fc9ebd4e39 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.java@@ -15,7 +15,8 @@ public class GlobalProjectSetting implements Serializable {private List<NamedProjectQuery> namedQueries = new ArrayList<>();public GlobalProjectSetting() {- namedQueries.add(new NamedProjectQuery("All", null));+ namedQueries.add(new NamedProjectQuery("All projects", null));+ namedQueries.add(new NamedProjectQuery("My projects", "owned by me"));}public List<NamedProjectQuery> getNamedQueries() {diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.javaindex 4704c0a396..cca3bc4402 100644--- a/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java@@ -125,7 +125,6 @@ public class JobMatch extends Criteria<Build> {public static void checkField(String fieldName, int operator) {if (fieldName.equals(Build.FIELD_PROJECT)- || fieldName.equals(Build.FIELD_PROJECT_OWNER)|| fieldName.equals(Build.FIELD_JOB)|| fieldName.equals(Build.FIELD_IMAGE)) {if (operator != JobMatchLexer.Is)diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.javaindex 2899dbe81f..550f381d1e 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java@@ -43,7 +43,6 @@ public class JobMatchBehavior extends ANTLRAssistBehavior {if ("criteriaField".equals(spec.getLabel())) {List<String> fields = Lists.newArrayList(Build.FIELD_PROJECT,- Build.FIELD_PROJECT_OWNER,Build.FIELD_JOB,Build.FIELD_IMAGE);return SuggestionUtils.suggest(fields, matchWith);@@ -56,10 +55,12 @@ public class JobMatchBehavior extends ANTLRAssistBehavior {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);Preconditions.checkState(fieldElements.size() == 1);String fieldName = JobMatch.getValue(fieldElements.get(0).getMatchedText());- if (fieldName.equals(Build.FIELD_PROJECT))- return SuggestionUtils.suggestProjects(matchWith);- else if (fieldName.equals(Build.FIELD_PROJECT_OWNER))- return SuggestionUtils.suggestUsers(matchWith);+ if (fieldName.equals(Build.FIELD_PROJECT)) {+ if (!matchWith.contains("*"))+ return SuggestionUtils.suggestProjects(matchWith);+ else+ return null;+ }}}return null;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.htmlindex 8b8bde11d4..806eb08e07 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="changes"><div wicket:id="commits"></div>- <div class="help-block"><i class="fa fa-info-circle"></i> This page lists changes since previous build on <a href="https://code.onedev.io/projects/onedev-manual/blob/master/pages/concepts.md#build-stream" target="_blank">same stream</a></div>+ <div class="help-block"><i class="fa fa-info-circle"></i> This page lists changes since previous build on <a wicket:id="buildStreamHelpUrl" target="_blank">same stream</a></div></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.javaindex 022cd81f46..4eb78f607a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java@@ -7,6 +7,8 @@ import java.util.List;import javax.annotation.Nullable;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.model.IModel;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -88,6 +90,16 @@ public class BuildChangesPage extends BuildDetailPage {}});++ add(new WebMarkupContainer("buildStreamHelpUrl") {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.put("href", OneDev.getInstance().getDocRoot() + "/pages/concepts.md#build-stream");+ }++ });}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.htmlindex 1ab14afaeb..a110a59846 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="issues"><div wicket:id="issues"></div>- <div class="help-block"><i class="fa fa-info-circle"></i> This page lists fixed issues since previous build on <a href="https://code.onedev.io/projects/onedev-manual/blob/master/pages/concepts.md#build-stream" target="_blank">same stream</a></div>+ <div class="help-block"><i class="fa fa-info-circle"></i> This page lists fixed issues since previous build on <a wicket:id="buildStreamHelpUrl" target="_blank">same stream</a></div></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.javaindex bae58e250e..537b904d8a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java@@ -6,10 +6,13 @@ import java.util.ArrayList;import javax.annotation.Nullable;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.model.IModel;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.OneDev;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.FixedInBuildCriteria;@@ -91,6 +94,17 @@ public class FixedIssuesPage extends BuildDetailPage {}});++ add(new WebMarkupContainer("buildStreamHelpUrl") {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.put("href", OneDev.getInstance().getDocRoot() + "/pages/concepts.md#build-stream");+ }++ });+}@Overridediff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.javaindex 2a212445ac..e8896c2f4b 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java@@ -32,7 +32,7 @@ public class JobHtmlReport extends JobReport {private String startPage;@Editable(order=1000, description="Specify report name. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@PathSegment@NotEmpty@@ -44,8 +44,8 @@ public class JobHtmlReport extends JobReport {this.reportName = reportName;}- @Editable(order=1100, description="Specify start page of the report relative to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>, for instance: api/index.html. "- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ @Editable(order=1100, description="Specify start page of the report relative to <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>, for instance: api/index.html. "+ + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getStartPage() {