The Unified and Autonomous Development Platform
Remove unnecessary issue counting logic from issue boards
Robin Shendbdc2473e929
diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex fc79b1dc45..7245d8d26d 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -1151,7 +1151,7 @@ public class Project extends AbstractEntity {board.setName(IssueConstants.FIELD_STATE);board.setIdentifyField(IssueConstants.FIELD_STATE);board.setColumns(Lists.newArrayList("Open", "Assigned", "Closed"));- board.setDisplayFields(Lists.newArrayList(IssueConstants.FIELD_STATE, "Priority", "Assignee"));+ board.setDisplayFields(Lists.newArrayList(IssueConstants.FIELD_STATE, "Type", "Priority", "Assignee"));issueBoards.add(board);}return issueBoards;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.javaindex 28537dc4ae..9143252438 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java@@ -58,6 +58,18 @@ abstract class BacklogColumnPanel extends Panel {}};++ private final IModel<Integer> countModel = new LoadableDetachableModel<Integer>() {++ @Override+ protected Integer load() {+ if (getQuery() != null)+ return OneDev.getInstance(IssueManager.class).count(getProject(), SecurityUtils.getUser(), getQuery().getCriteria());+ else+ return 0;+ }++ };private AbstractPostAjaxBehavior ajaxBehavior;@@ -122,8 +134,8 @@ abstract class BacklogColumnPanel extends Panel {}@Override- protected IssueQuery getQuery() {- return BacklogColumnPanel.this.getQuery();+ protected int getCount() {+ return countModel.getObject();}});@@ -186,6 +198,11 @@ abstract class BacklogColumnPanel extends Panel {return BacklogColumnPanel.this.getQuery();}+ @Override+ protected int getCardCount() {+ return countModel.getObject();+ }+});super.onBeforeRender();@@ -198,6 +215,7 @@ abstract class BacklogColumnPanel extends Panel {@Overrideprotected void onDetach() {queryModel.detach();+ countModel.detach();super.onDetach();}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.javaindex 22d4a95ea4..67602f6f10 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java@@ -98,6 +98,18 @@ abstract class BoardColumnPanel extends Panel implements EditContext {};+ private final IModel<Integer> countModel = new LoadableDetachableModel<Integer>() {++ @Override+ protected Integer load() {+ if (getQuery() != null)+ return OneDev.getInstance(IssueManager.class).count(getProject(), SecurityUtils.getUser(), getQuery().getCriteria());+ else+ return 0;+ }++ };+private AbstractPostAjaxBehavior ajaxBehavior;public BoardColumnPanel(String id) {@@ -107,6 +119,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {@Overrideprotected void onDetach() {queryModel.detach();+ countModel.detach();super.onDetach();}@@ -181,6 +194,11 @@ abstract class BoardColumnPanel extends Panel implements EditContext {return BoardColumnPanel.this.getQuery();}+ @Override+ protected int getCardCount() {+ return countModel.getObject();+ }+});super.onBeforeRender();@@ -290,8 +308,8 @@ abstract class BoardColumnPanel extends Panel implements EditContext {}@Override- protected IssueQuery getQuery() {- return BoardColumnPanel.this.getQuery();+ protected int getCount() {+ return countModel.getObject();}});diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardCountLabel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardCountLabel.javaindex ff60430d63..d60f25b712 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardCountLabel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardCountLabel.java@@ -2,20 +2,14 @@ package io.onedev.server.web.page.project.issues.issueboards;import java.util.Collection;-import javax.annotation.Nullable;-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.LoadableDetachableModel;import com.google.common.collect.Sets;-import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueManager;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.IssueBoard;-import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.WebSocketObserver;@SuppressWarnings("serial")@@ -28,7 +22,7 @@ abstract class CardCountLabel extends Label {@Overrideprotected String load() {- return String.valueOf(OneDev.getInstance(IssueManager.class).count(getProject(), SecurityUtils.getUser(), getQuery().getCriteria()));+ return String.valueOf(getCount());}});@@ -59,15 +53,7 @@ abstract class CardCountLabel extends Label {setOutputMarkupId(true);}- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getQuery() != null);- }-protected abstract Project getProject();- @Nullable- protected abstract IssueQuery getQuery();-+ protected abstract int getCount();}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.javaindex 4ea6189d9b..8c23b89f79 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.java@@ -38,13 +38,6 @@ abstract class CardListPanel extends Panel {protected void onInitialize() {super.onInitialize();- int cardCount;- if (getQuery() != null) {- cardCount = getIssueManager().count(getProject(), SecurityUtils.getUser(), getQuery().getCriteria());- } else {- cardCount = 0;- }-RepeatingView cardsView = new RepeatingView("cards");int index = 0;for (Issue issue: queryIssues(0, WebConstants.PAGE_SIZE)) {@@ -64,7 +57,7 @@ abstract class CardListPanel extends Panel {protected QueryPosition getPosition() {IssueQuery query = getQuery();if (query != null)- return new QueryPosition(query.toString(), cardCount, cardOffset);+ return new QueryPosition(query.toString(), getCardCount(), cardOffset);elsereturn null;}@@ -102,7 +95,7 @@ abstract class CardListPanel extends Panel {protected QueryPosition getPosition() {IssueQuery query = getQuery();if (query != null)- return new QueryPosition(query.toString(), cardCount, cardOffset);+ return new QueryPosition(query.toString(), getCardCount(), cardOffset);elsereturn null;}@@ -155,4 +148,6 @@ abstract class CardListPanel extends Panel {@Nullableprotected abstract IssueQuery getQuery();+ protected abstract int getCardCount();+}