Skip to content

The Unified and Autonomous Development Platform

Some minor improvements

Robin Shencf8664661b8b
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java
index 82e65c4167..1462d8f5ae 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java
@@ -19,7 +19,7 @@ import io.onedev.server.model.Build;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
-@Editable(order=150, name="Run Container", description="Run specified docker container. To access files in "
+@Editable(order=150, name="Run Docker Container", description="Run specified docker container. To access files in "
+ "job workspace, either use environment variable <tt>JOB_WORKSPACE</tt>, or specify volume mounts")
public class RunContainerStep extends Step {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.html b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.html
index 68a1d8be5c..2751c5c92b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <svg wicket:id="icon"></svg>
+ <svg wicket:id="icon"></svg><wicket:svg href="arrow" class="icon rotate-90"/>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java
index 0f1ab4273f..357fd05ecf 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java
@@ -331,7 +331,14 @@ abstract class StepEditPanel extends Panel implements BuildSpecAware, ParamSpecA
@Override
public double getMatchScore(TreeNode object) {
- return MatchScoreUtils.getMatchScore(object.getName(), searchInput);
+ String fullName = object.getName();
+ if (object instanceof StepNode) {
+ StepNode stepNode = (StepNode) object;
+ String groupName = EditableUtils.getGroup(stepNode.stepClass);
+ if (groupName != null)
+ fullName = groupName + "/" + fullName;
+ }
+ return MatchScoreUtils.getMatchScore(fullName, searchInput);
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
index e7b068bcde..2546c10778 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
@@ -399,7 +399,7 @@ public abstract class BuildDetailPage extends ProjectPage
}
if (SecurityUtils.canReadCode(getProject()))
- tabs.add(new BuildTab("In Pipeline", BuildPipelinePage.class));
+ tabs.add(new BuildTab("Pipeline", BuildPipelinePage.class));
LockUtils.read(getBuild().getArtifactsLockKey(), new Callable<Void>() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.html
index c3dee225f8..9b4590e977 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.html
@@ -2,6 +2,6 @@
<div wicket:id="pipeline" class="build-pipeline"></div>
<div class="font-size-sm text-muted">
<wicket:svg href="bulb" class="icon"/>
- This tab shows the pipeline current build is part of. The job in blue represents current job
+ This tab shows the pipeline current build is part of. The job in blue represents job of current build
</div>
</wicket:extend>
\ No newline at end of file