The Unified and Autonomous Development Platform
feat: Able to disable notifications for bulk operations (OD-1943)
Robin Shen8c06dce51489
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.javaindex c2d38907c3..eb5a6833c4 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java@@ -42,7 +42,7 @@ public interface IssueChangeManager extends EntityManager<IssueChange> {void addSchedule(Issue issue, Iteration iteration);- void addSchedule(List<Issue> issues, Iteration iteration);+ void addSchedule(List<Issue> issues, Iteration iteration, boolean sendNotifications);void removeSchedule(Issue issue, Iteration iteration);@@ -50,7 +50,8 @@ public interface IssueChangeManager extends EntityManager<IssueChange> {Collection<String> removeFields, @Nullable String comment);void batchUpdate(Iterator<? extends Issue> issues, @Nullable String state, @Nullable Boolean confidential,- @Nullable Collection<Iteration> iterations, Map<String, Object> fieldValues, @Nullable String comment);+ @Nullable Collection<Iteration> iterations, Map<String, Object> fieldValues,+ @Nullable String comment, boolean sendNotifications);List<IssueChange> queryAfter(Long projectId, Long afterChangeId, int count);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex b90142c8fb..bc76ed294a 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -110,6 +110,11 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>@Transactional@Overridepublic void create(IssueChange change, @Nullable String note) {+ create(change, note, true);+ }++ @Transactional+ protected void create(IssueChange change, @Nullable String note, boolean sendNotifications) {Preconditions.checkState(change.isNew());change.getIssue().getChanges().add(change);dao.persist(change);@@ -123,7 +128,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>comment.getIssue().setCommentCount(comment.getIssue().getCommentCount()+1);}- listenerRegistry.post(new IssueChanged(change, note));+ listenerRegistry.post(new IssueChanged(change, note, sendNotifications));}@Transactional@@ -244,20 +249,24 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>@Transactional@Overridepublic void addSchedule(Issue issue, Iteration iteration) {+ addSchedule(issue, iteration, true);+ }++ protected void addSchedule(Issue issue, Iteration iteration, boolean sendNotifications) {issueScheduleManager.create(issue.addSchedule(iteration));-+IssueChange change = new IssueChange();change.setIssue(issue);change.setData(new IssueIterationAddData(iteration.getName()));change.setUser(SecurityUtils.getUser());- create(change, null);+ create(change, null, sendNotifications);}-+@Transactional@Override- public void addSchedule(List<Issue> issues, Iteration iteration) {+ public void addSchedule(List<Issue> issues, Iteration iteration, boolean sendNotifications) {for (var issue: issues)- addSchedule(issue, iteration);+ addSchedule(issue, iteration, sendNotifications);}@Transactional@@ -314,7 +323,8 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>@Transactional@Overridepublic void batchUpdate(Iterator<? extends Issue> issues, @Nullable String state, @Nullable Boolean confidential,- @Nullable Collection<Iteration> iterations, Map<String, Object> fieldValues, @Nullable String comment) {+ @Nullable Collection<Iteration> iterations, Map<String, Object> fieldValues,+ @Nullable String comment, boolean sendNotifications) {while (issues.hasNext()) {Issue issue = issues.next();String prevState = issue.getState();@@ -348,7 +358,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>change.setData(new IssueBatchUpdateData(prevState, issue.getState(),prevConfidential, issue.isConfidential(), prevIterationList,currentIterationList, prevFields, issue.getFieldInputs()));- create(change, comment);+ create(change, comment, sendNotifications);}}}diff --git a/server-core/src/main/java/io/onedev/server/event/Event.java b/server-core/src/main/java/io/onedev/server/event/Event.javaindex b30c82cdc3..46acd1e8da 100644--- a/server-core/src/main/java/io/onedev/server/event/Event.java+++ b/server-core/src/main/java/io/onedev/server/event/Event.java@@ -5,7 +5,6 @@ import io.onedev.server.web.util.WicketUtils;import io.onedev.server.web.websocket.PageKey;import javax.annotation.Nullable;-import java.io.Serializable;public abstract class Event {@@ -15,7 +14,7 @@ public abstract class Event {public Event() {sourcePage = WicketUtils.getPageKey();}-+@Nullablepublic PageKey getSourcePage() {return sourcePage;diff --git a/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.java b/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.javaindex 24a08af23f..ef2b32508b 100644--- a/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.java@@ -2,7 +2,6 @@ package io.onedev.server.event.project;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.web.UrlManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.Event;import io.onedev.server.model.Project;@@ -10,6 +9,7 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.LastActivity;import io.onedev.server.notification.ActivityDetail;import io.onedev.server.util.commenttext.CommentText;+import io.onedev.server.web.UrlManager;import javax.annotation.Nullable;import java.io.Serializable;@@ -33,7 +33,7 @@ public abstract class ProjectEvent extends Event implements Serializable {this.date = date;projectId = project.getId();}-+public Project getProject() {return OneDev.getInstance(ProjectManager.class).load(projectId);}diff --git a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueChanged.java b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueChanged.javaindex f70e7090ec..d3c8c9a396 100644--- a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueChanged.java+++ b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueChanged.java@@ -1,13 +1,7 @@package io.onedev.server.event.project.issue;-import java.util.Collection;-import java.util.Map;--import javax.annotation.Nullable;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;-import io.onedev.server.web.UrlManager;import io.onedev.server.model.Group;import io.onedev.server.model.IssueChange;import io.onedev.server.model.User;@@ -17,6 +11,11 @@ import io.onedev.server.util.CommitAware;import io.onedev.server.util.ProjectScopedCommit;import io.onedev.server.util.commenttext.CommentText;import io.onedev.server.util.commenttext.MarkdownText;+import io.onedev.server.web.UrlManager;++import javax.annotation.Nullable;+import java.util.Collection;+import java.util.Map;public class IssueChanged extends IssueEvent implements CommitAware {@@ -27,11 +26,15 @@ public class IssueChanged extends IssueEvent implements CommitAware {private final String comment;public IssueChanged(IssueChange change, @Nullable String comment) {- super(change.getUser(), change.getDate(), change.getIssue());+ this(change, comment, true);+ }++ public IssueChanged(IssueChange change, @Nullable String comment, boolean sendNotifications) {+ super(change.getUser(), change.getDate(), change.getIssue(), sendNotifications);changeId = change.getId();this.comment = comment;}-+public IssueChange getChange() {return OneDev.getInstance(IssueChangeManager.class).load(changeId);}diff --git a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueEvent.java b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueEvent.javaindex bf2cce6642..aed44fc102 100644--- a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueEvent.java@@ -2,11 +2,11 @@ package io.onedev.server.event.project.issue;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;-import io.onedev.server.web.UrlManager;import io.onedev.server.event.project.ProjectEvent;import io.onedev.server.model.Group;import io.onedev.server.model.Issue;import io.onedev.server.model.User;+import io.onedev.server.web.UrlManager;import java.util.Collection;import java.util.Date;@@ -19,11 +19,18 @@ public abstract class IssueEvent extends ProjectEvent {private final Long issueId;+ private final boolean sendNotifications;+public IssueEvent(User user, Date date, Issue issue) {+ this(user, date, issue, true);+ }++ public IssueEvent(User user, Date date, Issue issue, boolean sendNotifications) {super(user, date, issue.getProject());issueId = issue.getId();+ this.sendNotifications = sendNotifications;}-+public Issue getIssue() {return OneDev.getInstance(IssueManager.class).load(issueId);}@@ -48,4 +55,7 @@ public abstract class IssueEvent extends ProjectEvent {return OneDev.getInstance(UrlManager.class).urlFor(getIssue());}+ public boolean isSendNotifications() {+ return sendNotifications;+ }}diff --git a/server-core/src/main/java/io/onedev/server/notification/ChannelNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/ChannelNotificationManager.javaindex acae9ff5c5..23984f24f5 100644--- a/server-core/src/main/java/io/onedev/server/notification/ChannelNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/ChannelNotificationManager.java@@ -54,7 +54,7 @@ public abstract class ChannelNotificationManager<T extends ChannelNotificationSe@Sessional@Listenpublic void on(IssueEvent event) {- if (!event.isMinor()) {+ if (!event.isMinor() && event.isSendNotifications()) {Issue issue = event.getIssue();User user = event.getUser();diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.javaindex 07c9dde02b..a8dd9b0a0a 100644--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java@@ -145,7 +145,7 @@ public class IssueNotificationManager extends AbstractNotificationManager {@Transactional@Listenpublic void on(IssueEvent event) {- if (event.isMinor())+ if (event.isMinor() || !event.isSendNotifications())return;Issue issue = event.getIssue();diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/iteration/IterationCrumbPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/iteration/IterationCrumbPanel.htmlindex fd60a2325a..b936a1f91b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/iteration/IterationCrumbPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/iteration/IterationCrumbPanel.html@@ -1,6 +1,6 @@<wicket:panel><div wicket:id="edit" class="iteration-crumb">- <a wicket:id="iterations" onclick="event.stopPropagation();">+ <a wicket:id="iterations" onclick="event.stopPropagation();" class="mr-1 mr-last-child-0"><wicket:svg href="iteration" class="icon"/><span wicket:id="name"></span></a>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.htmlindex 62060aeb29..7953e69109 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.html@@ -28,7 +28,20 @@</div><div wicket:id="builtInFieldsEditor"></div><div wicket:id="customFieldsEditor"></div>- <div wicket:id="comment" placeholder="Leave a comment"></div>+ <div wicket:id="comment" class="mb-4" placeholder="Leave a comment"></div>+ <div class="form-group">+ <label class="name control-label">+ <span>Send Notifications</span>+ </label>+ <div>+ <span class="switch switch-sm switch-primary">+ <label>+ <input wicket:id="sendNotifications" type="checkbox"><span></span>+ </label>+ </span>+ </div>+ <div class="text-muted form-text">Whether or not to send notifications to issue watchers for this change</div>+ </div></div><div class="modal-footer"><input wicket:id="save" type="submit" class="btn btn-primary" value="Save">diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.javaindex 7c1153e42a..0e0567e9cb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java@@ -28,6 +28,7 @@ import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;import org.apache.wicket.model.PropertyModel;import com.google.common.collect.Lists;@@ -69,6 +70,8 @@ abstract class BatchEditPanel extends Panel implements InputContext {private String comment;+ private boolean sendNotifications;+public BatchEditPanel(String id) {super(id);}@@ -255,6 +258,9 @@ abstract class BatchEditPanel extends Panel implements InputContext {}});++ form.add(new CheckBox("sendNotifications", new PropertyModel<>(this, "sendNotifications")));+form.add(new AjaxButton("save") {private RunTaskBehavior runTaskBehavior;@@ -299,7 +305,7 @@ abstract class BatchEditPanel extends Panel implements InputContext {Map<String, Object> fieldValues = FieldUtils.getFieldValues(customFieldsEditor.newComponentContext(),customFieldsBean, selectedFields);OneDev.getInstance(IssueChangeManager.class).batchUpdate(- getIssueIterator(), state, confidential, iterations, fieldValues, comment);+ getIssueIterator(), state, confidential, iterations, fieldValues, comment, sendNotifications);onUpdated(target);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.htmlindex 285aae323a..57689618f9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html@@ -70,7 +70,7 @@</div><div class="secondary d-flex flex-wrap"><div class="flex-grow-1 d-flex flex-wrap">- <div wicket:id="fields" class="field"></div>+ <div wicket:id="fields" class="field mr-1 mr-last-child-0"></div></div><div class="last-update d-none d-lg-block text-muted font-size-sm"><a wicket:id="user" class="link-gray"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.javaindex f77964062f..c684bfe4dd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java@@ -13,12 +13,12 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.EditContext;import io.onedev.server.util.ProjectScope;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.menu.MenuItem;-import io.onedev.server.web.component.menu.MenuLink;+import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.page.base.BasePage;+import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.RepeatingView;@@ -28,7 +28,6 @@ import org.apache.wicket.util.visit.IVisitor;import javax.annotation.Nullable;import java.util.ArrayList;-import java.util.List;@SuppressWarnings("serial")abstract class AbstractColumnPanel extends Panel implements EditContext {@@ -108,57 +107,54 @@ abstract class AbstractColumnPanel extends Panel implements EditContext {@Nullableprotected abstract String getIterationPrefix();- protected MenuLink newAddToIterationLink(String componentId) {- return new MenuLink(componentId) {+ protected Component newAddToIterationLink(String componentId) {+ if (getQuery() != null && SecurityUtils.canScheduleIssues(getProject())) {- @Override- protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {- var menuItems = new ArrayList<MenuItem>();- for (var iteration: getProject().getSortedHierarchyIterations()) {- if ((getIterationPrefix() == null || iteration.getName().startsWith(getIterationPrefix()))- && (isBacklog() || !iteration.equals(getIterationSelection().getIteration()))) {- var iterationId = iteration.getId();- menuItems.add(new MenuItem() {- @Override- public String getLabel() {- return iteration.getName();- }-- @Override- public WebMarkupContainer newLink(String id) {- return new AjaxLink<Void>(id) {-- @Override- public void onClick(AjaxRequestTarget target) {- BasePage page = (BasePage) getPage();- dropdown.close();- var iteration = getIterationManager().load(iterationId);- var issues = new ArrayList<Issue>();- for (var issue: getIssueManager().query(getProjectScope(), getQuery(),- false, 0, Integer.MAX_VALUE)) {- if (issue.getSchedules().stream().noneMatch(it->it.getIteration().equals(iteration)))- issues.add(issue);- }- getIssueChangeManager().addSchedule(issues, iteration);- for (var issue: issues)- page.notifyObservablesChange(target, issue.getChangeObservables(true));- }-- };+ return new AjaxLink<Void>(componentId) {++ @Override+ public void onClick(AjaxRequestTarget target) {+ var bean = new AddToIterationBean();+ bean.setProjectId(getProject().getId());+ bean.setBacklog(isBacklog());+ bean.setIterationPrefix(getIterationPrefix());+ if (getIterationSelection().getIteration() != null)+ bean.setBoardIteration(getIterationSelection().getIteration().getName());+ new BeanEditModalPanel<>(target, bean) {++ @Override+ protected void onSave(AjaxRequestTarget target, AddToIterationBean bean) {+ BasePage page = (BasePage) getPage();+ close();+ var iteration = getIterationManager().findInHierarchy(getProject(), bean.getIteration());+ var issues = new ArrayList<Issue>();+ for (var issue : getIssueManager().query(getProjectScope(), getQuery(),+ false, 0, Integer.MAX_VALUE)) {+ if (issue.getSchedules().stream().noneMatch(it -> it.getIteration().equals(iteration)))+ issues.add(issue);}- });- }+ getIssueChangeManager().addSchedule(issues, iteration, bean.isSendNotifications());+ for (var issue : issues)+ page.notifyObservablesChange(target, issue.getChangeObservables(true));+ }++ };}- return menuItems;- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getQuery() != null && SecurityUtils.canScheduleIssues(getProject()));- }-- };++ }.add(AttributeAppender.append("style", new LoadableDetachableModel<String>() {+ @Override+ protected String load() {+ // We may also toggle this link in javascript when card is moved between columns,+ // so simply hide it instead of calling setVisible(false)+ if (countModel.getObject() == 0)+ return "display: none;";+ else+ return "";+ }+ }));+ } else {+ return new WebMarkupContainer(componentId);+ }}protected abstract boolean isBacklog();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AddToIterationBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AddToIterationBean.javanew file mode 100644index 0000000000..9b29cbb376--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AddToIterationBean.java@@ -0,0 +1,101 @@+package io.onedev.server.web.page.project.issues.boards;++import io.onedev.server.OneDev;+import io.onedev.server.annotation.ChoiceProvider;+import io.onedev.server.annotation.Editable;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.util.EditContext;++import javax.validation.constraints.NotEmpty;+import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++@Editable(name="Add Issues to Iteration")+public class AddToIterationBean implements Serializable {++ private Long projectId;++ private String iterationPrefix;++ private String boardIteration;++ private boolean backlog;++ private String iteration;++ private boolean sendNotifications;++ @Editable(hidden = true)+ public Long getProjectId() {+ return projectId;+ }++ public void setProjectId(Long projectId) {+ this.projectId = projectId;+ }++ @Editable(hidden = true)+ public String getIterationPrefix() {+ return iterationPrefix;+ }++ public void setIterationPrefix(String iterationPrefix) {+ this.iterationPrefix = iterationPrefix;+ }++ @Editable(hidden = true)+ public String getBoardIteration() {+ return boardIteration;+ }++ public void setBoardIteration(String boardIteration) {+ this.boardIteration = boardIteration;+ }++ @Editable(hidden = true)+ public boolean isBacklog() {+ return backlog;+ }++ public void setBacklog(boolean backlog) {+ this.backlog = backlog;+ }++ @Editable(order=100, description = "Select iteration to schedule issues into")+ @ChoiceProvider("getIterationChoices")+ @NotEmpty+ public String getIteration() {+ return iteration;+ }++ public void setIteration(String iteration) {+ this.iteration = iteration;+ }++ private static List<String> getIterationChoices() {+ var projectId = (Long) EditContext.get().getInputValue("projectId");+ var iterationPrefix = (String) EditContext.get().getInputValue("iterationPrefix");+ var boardIteration = (String) EditContext.get().getInputValue("boardIteration");+ var backlog = (boolean) EditContext.get().getInputValue("backlog");+ var project = OneDev.getInstance(ProjectManager.class).load(projectId);++ var iterations = new ArrayList<String>();+ for (var iteration: project.getSortedHierarchyIterations()) {+ if ((iterationPrefix == null || iteration.getName().startsWith(iterationPrefix))+ && (backlog || !iteration.getName().equals(boardIteration))) {+ iterations.add(iteration.getName());+ }+ }+ return iterations;+ }++ @Editable(order=200, description = "Whether or not to send notifications to issue watchers for this change")+ public boolean isSendNotifications() {+ return sendNotifications;+ }++ public void setSendNotifications(boolean sendNotifications) {+ this.sendNotifications = sendNotifications;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.javaindex 75ea3bce42..ffd8f35327 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java@@ -72,6 +72,8 @@ abstract class BacklogColumnPanel extends AbstractColumnPanel {private Component countLabel;+ private Component addToIterationLink;+private CardListPanel cardListPanel;public BacklogColumnPanel(String id) {@@ -120,7 +122,7 @@ abstract class BacklogColumnPanel extends AbstractColumnPanel {});- add(newAddToIterationLink("addToIteration"));+ add(addToIterationLink = newAddToIterationLink("addToIteration"));if (getQuery() != null && getProject().isTimeTracking() && WicketUtils.isSubscriptionActive()) {add(new DropdownLink("showProgress") {@@ -234,6 +236,8 @@ abstract class BacklogColumnPanel extends AbstractColumnPanel {@Overrideprotected void updateCardCount(IPartialPageRequestHandler handler) {handler.add(countLabel);+ if (addToIterationLink.getOutputMarkupId())+ handler.add(addToIterationLink);}});@@ -264,4 +268,5 @@ abstract class BacklogColumnPanel extends AbstractColumnPanel {protected boolean isBacklog() {return true;}+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.htmlindex c794415fa9..244aeb5dc9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html@@ -7,7 +7,7 @@<a wicket:id="showDetail" title="Click to show issue details" class="show-detail"><wicket:svg href="ellipsis" class="icon"/></a></div><div class="secondary d-flex align-items-center flex-wrap mb-n2">- <div wicket:id="fields" class="field"></div>+ <div wicket:id="fields" class="field mr-1 mr-last-child-0"></div><div class="avatars-and-progress ml-auto d-flex align-items-center flex-wrap"><div wicket:id="avatars" class="avatar"></div><div wicket:id="progress" class="d-flex align-items-center mr-2 mb-2"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex 3c2753c895..43f3e02d18 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -106,6 +106,8 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {private Component countLabel;+ private Component addToIterationLink;+private CardListPanel cardListPanel;public BoardColumnPanel(String id) {@@ -207,6 +209,8 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {@Overrideprotected void updateCardCount(IPartialPageRequestHandler handler) {handler.add(countLabel);+ if (addToIterationLink.getOutputMarkupId())+ handler.add(addToIterationLink);}});@@ -293,7 +297,7 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {head.add(new WebMarkupContainer("viewAsList").setVisible(false));}- head.add(newAddToIterationLink("addToIteration"));+ head.add(addToIterationLink = newAddToIterationLink("addToIteration"));head.add(new ModalLink("addCard") {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.jsindex b1bc031cf7..c8e39ac799 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js@@ -204,8 +204,10 @@ onedev.server.issueBoards = {if (accepted) {var $cardCount = $fromDroppable.parent().find(".card-count");$cardCount.text(parseInt($cardCount.text()) - 1);+ onedev.server.issueBoards.updateAddToIteration(fromDroppableId);$cardCount = $toDroppable.parent().find(".card-count");$cardCount.text(parseInt($cardCount.text()) + 1);+ onedev.server.issueBoards.updateAddToIteration(toDroppableId);} else {var $card = $toDroppable.children().eq(toIndex+1);var $insertBeforeCard = $fromDroppable.children().eq(fromIndex + 1);@@ -218,5 +220,15 @@ onedev.server.issueBoards = {changeCardCount: function(droppableId, change) {var $cardCount = $("#" + droppableId).parent().find(".card-count");$cardCount.text(parseInt($cardCount.text()) + change);+ onedev.server.issueBoards.updateAddToIteration(droppableId);+ },+ updateAddToIteration: function(droppableId) {+ var $droppable = $("#" + droppableId);+ var $addToIteration = $droppable.parent().find(".add-to-iteration");+ var cardCount = parseInt($droppable.parent().find(".card-count").text());+ if (cardCount > 0)+ $addToIteration.show();+ else+ $addToIteration.hide();}}\ No newline at end of file