The Unified and Autonomous Development Platform
Some minor improvements
Robin Shen56ab43b58ea0
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 3c5442ce9a..b5e8b98983 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@@ -986,4 +986,8 @@ public class Build extends AbstractEntity implements Referenceable, AttachmentStreturn uuid;}+ public boolean hasArtifacts() {+ return getArtifactsDir().exists() && getArtifactsDir().listFiles().length != 0;+ }+}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.javaindex bfc72e734f..5992dc9191 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@@ -472,7 +472,8 @@ public abstract class BuildDetailPage extends ProjectPageif (SecurityUtils.canReadCode(getProject()))tabs.add(new BuildTab("Pipeline", BuildPipelinePage.class));- tabs.add(new BuildTab("Artifacts", BuildArtifactsPage.class));+ if (SecurityUtils.canManage(getBuild()) || getBuild().hasArtifacts())+ tabs.add(new BuildTab("Artifacts", BuildArtifactsPage.class));tabs.add(new BuildTab("Fixed Issues", FixedIssuesPage.class) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.javaindex 58b3957129..5685e0c57a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java@@ -226,7 +226,7 @@ public class BuildArtifactsPage extends BuildDetailPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(hasArtifacts());+ setVisible(getBuild().hasArtifacts());}@Override@@ -239,7 +239,7 @@ public class BuildArtifactsPage extends BuildDetailPage {super.expand(file);File[] children = file.listFiles();- if (children.length == 1 && children[0].isDirectory())+ if (children != null && children.length == 1 && children[0].isDirectory())expand(children[0]);}@@ -282,7 +282,7 @@ public class BuildArtifactsPage extends BuildDetailPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!hasArtifacts());+ setVisible(!getBuild().hasArtifacts());}}.setOutputMarkupPlaceholderTag(true));@@ -293,11 +293,6 @@ public class BuildArtifactsPage extends BuildDetailPage {target.add(get("noArtifacts"));}- protected boolean hasArtifacts() {- return getBuild().getArtifactsDir().exists()- && getBuild().getArtifactsDir().listFiles().length != 0;- }-@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);