The Unified and Autonomous Development Platform
Display changes and fixed issues in build detail page
Robin Shen1daeaa777c55
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.javaindex 4e5e519a80..4f17069e37 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java@@ -24,7 +24,7 @@ public class FixedInCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {Collection<Long> fixedIssueNumbers = build.getFixedIssueNumbers();- if (!fixedIssueNumbers.isEmpty())+ if (fixedIssueNumbers != null && !fixedIssueNumbers.isEmpty())return context.getRoot().get(IssueConstants.ATTR_NUMBER).in(fixedIssueNumbers);elsereturn context.getBuilder().disjunction();@@ -32,7 +32,7 @@ public class FixedInCriteria extends IssueCriteria {@Overridepublic boolean matches(Issue issue, User user) {- return build.getFixedIssueNumbers().contains(issue.getNumber());+ return build.getFixedIssueNumbers() != null && build.getFixedIssueNumbers().contains(issue.getNumber());}@Overridediff --git a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex 62f17a37d2..2fef56af63 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -268,7 +268,7 @@ public class IssueQuery extends EntityQuery<Issue> {} else if (field instanceof BooleanInput) {return new BooleanFieldCriteria(fieldName, getBooleanValue(value));} else if (field instanceof NumberInput) {- return new NumberFieldCriteria(fieldName, getIntValue(value), operator);+ return new NumericFieldCriteria(fieldName, getIntValue(value), operator);} else if (field instanceof ChoiceInput) {long ordinal = getValueOrdinal((ChoiceInput) field, value);return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, false);@@ -290,7 +290,7 @@ public class IssueQuery extends EntityQuery<Issue> {} else {InputSpec field = getIssueSetting().getFieldSpec(fieldName);if (field instanceof NumberInput) {- return new NumberFieldCriteria(fieldName, getIntValue(value), operator);+ return new NumericFieldCriteria(fieldName, getIntValue(value), operator);} else {long ordinal;if (validate)diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/NumberFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/search/entity/issue/NumberFieldCriteria.javarename to core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.javaindex 9df616418c..681b3fc1f9 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/NumberFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java@@ -12,7 +12,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.QueryBuildContext;-public class NumberFieldCriteria extends FieldCriteria {+public class NumericFieldCriteria extends FieldCriteria {private static final long serialVersionUID = 1L;@@ -20,7 +20,7 @@ public class NumberFieldCriteria extends FieldCriteria {private final int operator;- public NumberFieldCriteria(String name, int value, int operator) {+ public NumericFieldCriteria(String name, int value, int operator) {super(name);this.value = value;this.operator = operator;diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex 20bc272606..0b0ff0bb7e 100644--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -57,6 +57,7 @@ import io.onedev.server.web.page.project.compare.RevisionComparePage;import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;import io.onedev.server.web.page.project.issues.create.NewIssuePage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;+import io.onedev.server.web.page.project.issues.detail.FixingBuildsPage;import io.onedev.server.web.page.project.issues.list.IssueListPage;import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;@@ -229,6 +230,7 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("projects/${project}/issue-boards/${board}", IssueBoardsPage.class));add(new OnePageMapper("projects/${project}/issue-list", IssueListPage.class));add(new OnePageMapper("projects/${project}/issues/${issue}/activities", IssueActivitiesPage.class));+ add(new OnePageMapper("projects/${project}/issues/${issue}/builds", FixingBuildsPage.class));add(new OnePageMapper("projects/${project}/issues/new", NewIssuePage.class));add(new OnePageMapper("projects/${project}/builds", ProjectBuildsPage.class));add(new OnePageMapper("projects/${project}/builds/${build}", BuildLogPage.class));diff --git a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.htmlindex df250b8b34..354189d23c 100644--- a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html@@ -14,7 +14,7 @@<a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a></div></div>- <div class="body">+ <div wicket:id="body" class="body"><div wicket:id="feedback"></div><table wicket:id="builds" class="table"></table></div>diff --git a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 945cbd6b77..4941f243b3 100644--- a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -107,8 +107,6 @@ public abstract class BuildListPanel extends Panel {private DataTable<Build, Void> buildsTable;- private SortableDataProvider<Build, Void> dataProvider;-public BuildListPanel(String id, @Nullable String query) {super(id);this.query = query;@@ -228,6 +226,9 @@ public abstract class BuildListPanel extends Panel {});+ WebMarkupContainer body = new WebMarkupContainer("body");+ add(body.setOutputMarkupId(true));+Form<?> form = new Form<Void>("query");form.add(input);form.add(new AjaxButton("submit") {@@ -235,14 +236,14 @@ public abstract class BuildListPanel extends Panel {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- target.add(BuildListPanel.this);+ target.add(body);onQueryUpdated(target, query);}});add(form);- dataProvider = new LoadableDetachableDataProvider<Build, Void>() {+ SortableDataProvider<Build, Void> dataProvider = new LoadableDetachableDataProvider<Build, Void>() {@Overridepublic Iterator<? extends Build> iterator(long first, long count) {@@ -273,7 +274,7 @@ public abstract class BuildListPanel extends Panel {};- add(new NotificationPanel("feedback", this));+ body.add(new NotificationPanel("feedback", this));List<IColumn<Build, Void>> columns = new ArrayList<>();@@ -402,10 +403,8 @@ public abstract class BuildListPanel extends Panel {}});- add(buildsTable = new HistoryAwareDataTable<Build, Void>("builds", columns, dataProvider,+ body.add(buildsTable = new HistoryAwareDataTable<Build, Void>("builds", columns, dataProvider,WebConstants.PAGE_SIZE, getPagingHistorySupport()));-- setOutputMarkupId(true);}private WebSocketObserver newBuildObserver(Long buildId) {diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.htmlindex 3ccc973793..f39b026451 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html@@ -14,7 +14,7 @@<a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a></div></div>- <div class="body">+ <div wicket:id="body" class="body"><div wicket:id="feedback"></div><table wicket:id="comments" class="table"></table></div>diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex f3ecc70f5b..ed80e184f0 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -185,6 +185,9 @@ public abstract class CodeCommentListPanel extends Panel {});+ WebMarkupContainer body = new WebMarkupContainer("body");+ add(body.setOutputMarkupId(true));+Form<?> form = new Form<Void>("query");form.add(input);form.add(new AjaxButton("submit") {@@ -192,20 +195,17 @@ public abstract class CodeCommentListPanel extends Panel {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);+ target.add(body);onQueryUpdated(target, query);}});add(form);- add(new NotificationPanel("feedback", this));+ body.add(new NotificationPanel("feedback", this));SortableDataProvider<CodeComment, Void> dataProvider = new LoadableDetachableDataProvider<CodeComment, Void>() {- @Override- public void detach() {- }-@Overridepublic Iterator<? extends CodeComment> iterator(long first, long count) {return getCodeCommentManager().query(getProject(), getPullRequest(), SecurityUtils.getUser(),@@ -325,7 +325,7 @@ public abstract class CodeCommentListPanel extends Panel {});- add(new HistoryAwareDataTable<CodeComment, Void>("comments", columns, dataProvider,+ body.add(new HistoryAwareDataTable<CodeComment, Void>("comments", columns, dataProvider,WebConstants.PAGE_SIZE, getPagingHistorySupport()) {@Overridediff --git a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex af0d05b7a1..126d1c5c21 100644--- a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -335,14 +335,23 @@ public abstract class CommitListPanel extends Panel {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- target.add(CommitListPanel.this);+ target.add(body);+ target.add(foot);onQueryUpdated(target, query);}});add(form);- body = new WebMarkupContainer("body");+ body = new WebMarkupContainer("body") {++ @Override+ protected void onBeforeRender() {+ replace(commitsView = newCommitsView());+ super.onBeforeRender();+ }++ };body.setOutputMarkupId(true);add(body);@@ -430,16 +439,8 @@ public abstract class CommitListPanel extends Panel {}});-- setOutputMarkupId(true);}- @Override- protected void onBeforeRender() {- body.replace(commitsView = newCommitsView());- super.onBeforeRender();- }-private RepeatingView newCommitsView() {RepeatingView commitsView = new RepeatingView("commits");commitsView.setOutputMarkupId(true);@@ -553,7 +554,7 @@ public abstract class CommitListPanel extends Panel {compareState.rightSide = new ProjectAndRevision(getProject(), getCompareWith());if (path != null)compareState.pathFilter = PatternSet.quoteIfNecessary(path);- compareState.tabPanel = RevisionComparePage.TabPanel.CHANGES;+ compareState.tabPanel = RevisionComparePage.TabPanel.FILE_CHANGES;params = RevisionComparePage.paramsOf(getProject(), compareState);item.add(new ViewStateAwarePageLink<Void>("compare", RevisionComparePage.class, params));diff --git a/core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css b/core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.cssindex d4003c8110..65544d43b2 100644--- a/core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css+++ b/core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css@@ -72,7 +72,7 @@text-align: center;}.commit-list>.foot>.alert, .commit-list>.foot>.btn {- margin-top: 8px;+ margin-top: 12px;margin-bottom: 0;}.commit-list li.date {diff --git a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex 058d9e6507..b581ce3bdc 100644--- a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -1137,7 +1137,7 @@ public class RevisionDiffPanel extends Panel {state.leftSide = new ProjectAndRevision(comment.getProject(),comment.getMarkPos().getCommit());state.rightSide = new ProjectAndRevision(comment.getProject(), revision);- state.tabPanel = RevisionComparePage.TabPanel.CHANGES;+ state.tabPanel = RevisionComparePage.TabPanel.FILE_CHANGES;state.whitespaceOption = whitespaceOptionModel.getObject();PageParameters params = RevisionComparePage.paramsOf(comment.getProject(), state);setResponsePage(RevisionComparePage.class, params);diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.htmlindex 8f76f9d655..2cbb1de18f 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html@@ -18,7 +18,7 @@<a wicket:id="listFields" class="list-fields pull-left"><i class="fa fa-list-ul"></i> Display Fields</a></div></div>- <div class="body">+ <div wicket:id="body" class="body"><div wicket:id="feedback"></div><table wicket:id="issues" class="table"></table></div>diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex 83deeba55f..a87e1311ed 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -243,6 +243,9 @@ public abstract class IssueListPanel extends Panel {});+ WebMarkupContainer body = new WebMarkupContainer("body");+ add(body.setOutputMarkupId(true));+Form<?> form = new Form<Void>("query");form.add(input);form.add(new AjaxButton("submit") {@@ -250,7 +253,7 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- target.add(IssueListPanel.this);+ target.add(body);onQueryUpdated(target, query);}@@ -489,7 +492,7 @@ public abstract class IssueListPanel extends Panel {};- add(new NotificationPanel("feedback", this));+ body.add(new NotificationPanel("feedback", this));List<IColumn<Issue, Void>> columns = new ArrayList<>();@@ -585,7 +588,7 @@ public abstract class IssueListPanel extends Panel {});}- add(issuesTable = new HistoryAwareDataTable<Issue, Void>("issues", columns, dataProvider,+ body.add(issuesTable = new HistoryAwareDataTable<Issue, Void>("issues", columns, dataProvider,WebConstants.PAGE_SIZE, getPagingHistorySupport()) {@Override@@ -597,8 +600,6 @@ public abstract class IssueListPanel extends Panel {return item;}});-- setOutputMarkupId(true);}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.cssindex 88553dbe0f..04521db262 100644--- a/core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css@@ -152,6 +152,9 @@ a.wicket_orderUp:AFTER {a.wicket_orderDown:AFTER {content: "\f063";}+.pagination {+ margin-bottom: 0;+}.pagination a.first, .pagination a.prev, .pagination a.next, .pagination a.last {font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex dda48927c5..13e8ef7974 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -306,7 +306,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searstate.leftSide = new ProjectAndRevision(comment.getProject(),comment.getMarkPos().getCommit());state.rightSide = new ProjectAndRevision(comment.getProject(), revision);- state.tabPanel = RevisionComparePage.TabPanel.CHANGES;+ state.tabPanel = RevisionComparePage.TabPanel.FILE_CHANGES;state.whitespaceOption = context.getOpenComment().getCompareContext().getWhitespaceOption();PageParameters params = RevisionComparePage.paramsOf(comment.getProject(), state);setResponsePage(RevisionComparePage.class, params);diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildChangesPage.html b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildChangesPage.htmlindex 9f340ecba2..aa9dc91262 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildChangesPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildChangesPage.html@@ -1,3 +1,10 @@<wicket:extend>- This is build changes+ <div wicket:id="content" class="changes"></div>+ <wicket:fragment wicket:id="availableFrag">+ <div wicket:id="commits"></div>+ <div class="help-block"><i class="fa fa-info-circle"></i> This page lists changes in the build compared to all previous builds in job '<span wicket:id="jobName"></span>'</div>+ </wicket:fragment>+ <wicket:fragment wicket:id="notAvailableFrag">+ <div class="alert alert-warning">Changes not calcualted yet, please wait a while and refresh again</div>+ </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildChangesPage.java b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildChangesPage.javaindex 7094794b11..5783837cdc 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildChangesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildChangesPage.java@@ -1,12 +1,84 @@package io.onedev.server.web.page.project.builds.detail;+import java.util.ArrayList;+import java.util.Collection;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.ObjectId;++import com.google.common.collect.Lists;++import io.onedev.server.OneDev;+import io.onedev.server.cache.BuildInfoManager;+import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.search.commit.CommitQuery;+import io.onedev.server.search.commit.Revision;+import io.onedev.server.search.commit.RevisionCriteria;+import io.onedev.server.web.component.commit.list.CommitListPanel;+import io.onedev.server.web.util.QueryPosition;@SuppressWarnings("serial")public class BuildChangesPage extends BuildDetailPage {+ private static final String PARAM_QUERY = "query";++ private String query;+public BuildChangesPage(PageParameters params) {super(params);+ query = params.get(PARAM_QUERY).toString();}+ @Override+ protected void onInitialize() {+ super.onInitialize();++ BuildInfoManager buildInfoManager = OneDev.getInstance(BuildInfoManager.class);+ Collection<ObjectId> prevCommitIds = buildInfoManager.getPrevCommits(getProject(), getBuild().getId());+ if (prevCommitIds != null) {+ Fragment fragment = new Fragment("content", "availableFrag", this);+ fragment.add(new Label("jobName", getBuild().getJobName()));+ fragment.add(new CommitListPanel("commits", query) {++ @Override+ protected Project getProject() {+ return BuildChangesPage.this.getProject();+ }++ @Override+ protected void onQueryUpdated(AjaxRequestTarget target, String query) {+ setResponsePage(BuildChangesPage.class, BuildChangesPage.paramsOf(getBuild(), getPosition(), query));+ }++ @Override+ protected CommitQuery getBaseQuery() {+ List<Revision> revisions = new ArrayList<>();++ for (ObjectId prevCommitId: prevCommitIds)+ revisions.add(new Revision(prevCommitId.name(), Revision.Scope.SINCE));+ revisions.add(new Revision(getBuild().getCommitHash(), Revision.Scope.UNTIL));+ return new CommitQuery(Lists.newArrayList(new RevisionCriteria(revisions)));+ }++ });+ add(fragment);+ } else {+ add(new Fragment("content", "notAvailableFrag", this));+ }+ }++ public static PageParameters paramsOf(Build build, @Nullable QueryPosition position, @Nullable String query) {+ PageParameters params = paramsOf(build, position);+ if (query != null)+ params.add(PARAM_QUERY, query);+ return params;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/FixedIssuesPage.html b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/FixedIssuesPage.htmlindex ac45d500cc..9add108715 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/FixedIssuesPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/FixedIssuesPage.html@@ -1,3 +1,10 @@<wicket:extend>- This is fixed issues+ <div wicket:id="content" class="issues"></div>+ <wicket:fragment wicket:id="availableFrag">+ <div wicket:id="issues"></div>+ <div class="help-block"><i class="fa fa-info-circle"></i> This page lists fixed issues in the build compared to all previous builds in job '<span wicket:id="jobName"></span>'</div>+ </wicket:fragment>+ <wicket:fragment wicket:id="notAvailableFrag">+ <div class="alert alert-warning">Fixed issues not calcualted yet, please wait a while and refresh again</div>+ </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/FixedIssuesPage.java b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/FixedIssuesPage.javaindex 625b469ffb..7b6540488d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/FixedIssuesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/FixedIssuesPage.java@@ -1,12 +1,91 @@package io.onedev.server.web.page.project.builds.detail;+import java.util.ArrayList;++import javax.annotation.Nullable;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.search.entity.issue.FixedInCriteria;+import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.web.component.issue.list.IssueListPanel;+import io.onedev.server.web.util.PagingHistorySupport;+import io.onedev.server.web.util.QueryPosition;+@SuppressWarnings("serial")public class FixedIssuesPage extends BuildDetailPage {+ private static final String PARAM_QUERY = "query";++ private static final String PARAM_CURRENT_PAGE = "currentPage";++ private String query;+public FixedIssuesPage(PageParameters params) {super(params);+ query = params.get(PARAM_QUERY).toString();}+ @Override+ protected void onInitialize() {+ super.onInitialize();++ if (getBuild().getFixedIssueNumbers() != null) {+ Fragment fragment = new Fragment("content", "availableFrag", this);+ fragment.add(new Label("jobName", getBuild().getJobName()));+ fragment.add(new IssueListPanel("issues", query) {++ @Override+ protected Project getProject() {+ return FixedIssuesPage.this.getProject();+ }++ @Override+ protected IssueQuery getBaseQuery() {+ return new IssueQuery(new FixedInCriteria(getBuild()), new ArrayList<>());+ }++ @Override+ protected PagingHistorySupport getPagingHistorySupport() {+ return new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = paramsOf(getBuild(), getPosition(), query);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;+ }++ };+ }++ @Override+ protected void onQueryUpdated(AjaxRequestTarget target, String query) {+ setResponsePage(FixedIssuesPage.class, FixedIssuesPage.paramsOf(getBuild(), getPosition(), query));+ }++ });+ add(fragment);+ } else {+ add(new Fragment("content", "notAvailableFrag", this));+ }+ }++ public static PageParameters paramsOf(Build build, @Nullable QueryPosition position, @Nullable String query) {+ PageParameters params = paramsOf(build, position);+ if (query != null)+ params.add(PARAM_QUERY, query);+ return params;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.cssindex e58a3bc632..16661527c5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css@@ -76,3 +76,7 @@margin-right: 0;}}++#build-detail>.main>.changes .help-block {+ margin-top: 16px;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex 5e4ce78d4b..eb41339e3e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -66,7 +66,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {public enum TabPanel {COMMITS,- CHANGES;+ FILE_CHANGES;public static TabPanel of(@Nullable String name) {if (name != null) {@@ -131,7 +131,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {state.leftSide = new ProjectAndRevision(project, comment.getMarkPos().getCommit());state.rightSide = new ProjectAndRevision(project, compareCommit);}- state.tabPanel = RevisionComparePage.TabPanel.CHANGES;+ state.tabPanel = RevisionComparePage.TabPanel.FILE_CHANGES;state.whitespaceOption = compareContext.getWhitespaceOption();state.pathFilter = compareContext.getPathFilter();return state;@@ -466,16 +466,16 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {});- tabs.add(new AjaxActionTab(Model.of("Changes")) {+ tabs.add(new AjaxActionTab(Model.of("File Changes")) {@Overridepublic boolean isSelected() {- return state.tabPanel == TabPanel.CHANGES;+ return state.tabPanel == TabPanel.FILE_CHANGES;}@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {- state.tabPanel = TabPanel.CHANGES;+ state.tabPanel = TabPanel.FILE_CHANGES;newTabPanel(target);pushState(target);}@@ -512,7 +512,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {};WebMarkupContainer tabPanel;switch (state.tabPanel) {- case CHANGES:+ case FILE_CHANGES:IModel<String> blameModel = new IModel<String>() {@Override@@ -699,7 +699,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {commentState.rightSide = new ProjectAndRevision(state.rightSide.getProject(), rightCommitId.name());commentState.mark = comment.getMarkPos();commentState.commentId = comment.getId();- commentState.tabPanel = TabPanel.CHANGES;+ commentState.tabPanel = TabPanel.FILE_CHANGES;commentState.pathFilter = state.pathFilter;commentState.whitespaceOption = state.whitespaceOption;commentState.compareWithMergeBase = false;@@ -754,7 +754,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {markState.rightSide = new ProjectAndRevision(state.rightSide.getProject(), rightCommitId.name());markState.mark = mark;markState.pathFilter = state.pathFilter;- markState.tabPanel = TabPanel.CHANGES;+ markState.tabPanel = TabPanel.FILE_CHANGES;markState.whitespaceOption = state.whitespaceOption;markState.compareWithMergeBase = false;return urlFor(RevisionComparePage.class, paramsOf(markState.rightSide.getProject(), markState)).toString();diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.htmlnew file mode 100644index 0000000000..569b482680--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.html@@ -0,0 +1,4 @@+<wicket:extend>+ <div wicket:id="builds"></div>+ <div class="help-block"><i class="fa fa-info-circle"></i> This page lists all builds containing the the issue fix</div>+</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.javarename to core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.javaindex 19b0eb3338..3ac3a79302 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.java@@ -16,7 +16,7 @@ import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QueryPosition;@SuppressWarnings("serial")-public class IssueBuildsPage extends IssueDetailPage {+public class FixingBuildsPage extends IssueDetailPage {private static final String PARAM_QUERY = "query";@@ -24,7 +24,7 @@ public class IssueBuildsPage extends IssueDetailPage {private String query;- public IssueBuildsPage(PageParameters params) {+ public FixingBuildsPage(PageParameters params) {super(params);query = params.get(PARAM_QUERY).toString();}@@ -66,7 +66,7 @@ public class IssueBuildsPage extends IssueDetailPage {@Overrideprotected void onQueryUpdated(AjaxRequestTarget target, String query) {- setResponsePage(IssueBuildsPage.class, IssueBuildsPage.paramsOf(getIssue(), getPosition(), query));+ setResponsePage(FixingBuildsPage.class, FixingBuildsPage.paramsOf(getIssue(), getPosition(), query));}});diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.htmldeleted file mode 100644index 54a01e2345..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:extend>- <div wicket:id="builds"></div>-</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex 1ae6e21df8..d3ac3bf790 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -143,7 +143,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexCollection<ObjectId> fixCommits = commitInfoManager.getFixCommits(getProject(), getIssue().getNumber());if (!fixCommits.isEmpty()) // Do not calculate fix builds now as it might be slow- tabs.add(new IssueTab("Builds", IssueBuildsPage.class));+ tabs.add(new IssueTab("Fixing Builds", FixingBuildsPage.class));add(new Tabbable("issueTabs", tabs).setOutputMarkupId(true));diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 0233e94227..1ab2d9b07d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -769,7 +769,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {state.leftSide = new ProjectAndBranch(source.getProject(), getPullRequest().getBaseCommitHash());state.rightSide = new ProjectAndBranch(source.getProject(), getPullRequest().getHeadCommitHash());state.pathFilter = pathFilter;- state.tabPanel = RevisionComparePage.TabPanel.CHANGES;+ state.tabPanel = RevisionComparePage.TabPanel.FILE_CHANGES;state.whitespaceOption = whitespaceOption;state.compareWithMergeBase = false;return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(source.getProject(), state)).toString();@@ -828,7 +828,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {state.leftSide = new ProjectAndBranch(source.getProject(), getPullRequest().getBaseCommitHash());state.rightSide = new ProjectAndBranch(source.getProject(), getPullRequest().getHeadCommitHash());state.pathFilter = pathFilter;- state.tabPanel = RevisionComparePage.TabPanel.CHANGES;+ state.tabPanel = RevisionComparePage.TabPanel.FILE_CHANGES;state.whitespaceOption = whitespaceOption;state.compareWithMergeBase = false;return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(source.getProject(), state)).toString();