Skip to content

The Unified and Autonomous Development Platform

Add note for fixed issues of first build in job

Robin Shen5370a8ff58ad
diff --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.html
index 4352593fa1..5904cbdafa 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,10 @@
<wicket:extend>
- <div class="issues">
+ <div wicket:id="content" class="issues"></div>
+ <wicket:fragment wicket:id="hasPreviousBuildFrag">
<div wicket:id="issues"></div>
<div class="font-size-sm text-muted mt-4"><wicket:svg href="bulb" class="icon mt-n1 mr-1"/> This page lists fixed issues since previous build on <a wicket:id="buildStreamHelpUrl" class="link-primary" target="_blank">same stream</a></div>
- </div>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="noPreviousBuildFrag">
+ <div class="alert alert-light-warning">Fixed issues not available for first build of a job</div>
+ </wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --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.java
index 537b904d8a..c44bbc3fe7 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
@@ -8,6 +8,7 @@ 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.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -40,73 +41,80 @@ public class FixedIssuesPage extends BuildDetailPage {
@Override
protected void onInitialize() {
super.onInitialize();
-
- add(issueList = new IssueListPanel("issues", new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- return query;
- }
-
- @Override
- public void setObject(String object) {
- query = object;
- PageParameters params = getPageParameters();
- params.set(PARAM_QUERY, query);
- params.remove(PARAM_PAGE);
- CharSequence url = RequestCycle.get().urlFor(FixedIssuesPage.class, params);
- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);
- }
-
- }) {
- @Override
- protected IssueQuery getBaseQuery() {
- return new IssueQuery(new FixedInBuildCriteria(getBuild()), new ArrayList<>());
- }
+ if (getBuild().getStreamPrevious(null) != null) {
+ Fragment fragment = new Fragment("content", "hasPreviousBuildFrag", this);
- @Override
- protected PagingHistorySupport getPagingHistorySupport() {
- return new PagingHistorySupport() {
-
- @Override
- public PageParameters newPageParameters(int currentPage) {
- PageParameters params = paramsOf(getBuild(), query);
- params.add(PARAM_PAGE, currentPage+1);
- return params;
- }
-
- @Override
- public int getCurrentPage() {
- return getPageParameters().get(PARAM_PAGE).toInt(1)-1;
- }
-
- };
- }
-
- @Override
- protected Project getProject() {
- return FixedIssuesPage.this.getProject();
- }
+ fragment.add(issueList = new IssueListPanel("issues", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ return query;
+ }
+
+ @Override
+ public void setObject(String object) {
+ query = object;
+ PageParameters params = getPageParameters();
+ params.set(PARAM_QUERY, query);
+ params.remove(PARAM_PAGE);
+ CharSequence url = RequestCycle.get().urlFor(FixedIssuesPage.class, params);
+ pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);
+ }
+
+ }) {
+
+ @Override
+ protected IssueQuery getBaseQuery() {
+ return new IssueQuery(new FixedInBuildCriteria(getBuild()), new ArrayList<>());
+ }
+
+ @Override
+ protected PagingHistorySupport getPagingHistorySupport() {
+ return new PagingHistorySupport() {
+
+ @Override
+ public PageParameters newPageParameters(int currentPage) {
+ PageParameters params = paramsOf(getBuild(), query);
+ params.add(PARAM_PAGE, currentPage+1);
+ return params;
+ }
+
+ @Override
+ public int getCurrentPage() {
+ return getPageParameters().get(PARAM_PAGE).toInt(1)-1;
+ }
+
+ };
+ }
+
+ @Override
+ protected Project getProject() {
+ return FixedIssuesPage.this.getProject();
+ }
+
+ });
- });
-
- add(new WebMarkupContainer("buildStreamHelpUrl") {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.put("href", OneDev.getInstance().getDocRoot() + "/pages/concepts.md#build-stream");
- }
+ fragment.add(new WebMarkupContainer("buildStreamHelpUrl") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.put("href", OneDev.getInstance().getDocRoot() + "/pages/concepts.md#build-stream");
+ }
+
+ });
- });
-
+ add(fragment);
+ } else {
+ add(new Fragment("content", "noPreviousBuildFrag", this));
+ }
}
-
+
@Override
protected void onPopState(AjaxRequestTarget target, Serializable data) {
query = (String) data;