The Unified and Autonomous Development Platform
Fix some issue boards bugs
Robin Shenaae6dd149cbb
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.javaindex e1a722379c..f01c002387 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java@@ -172,7 +172,6 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangechange.setDate(new Date());change.setUser(user);change.setData(new IssueStateChangeData(prevState, issue.getState(), prevFields, issue.getFields(), comment));-save(change);}}diff --git a/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.javaindex 8b17c50429..28bf61b0f2 100644--- a/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java@@ -43,6 +43,18 @@ public abstract class InfiniteScrollBehavior extends AbstractPostAjaxBehavior {IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();int offset = params.getParameterValue("offset").toInt();int count = params.getParameterValue("count").toInt();+ if (offset == 0) {+ WebMarkupContainer container = (WebMarkupContainer) getComponent();+ container.visitChildren(RepeatingView.class, new IVisitor<RepeatingView, Void>() {++ @Override+ public void component(RepeatingView component, IVisit<Void> visit) {+ component.removeAll();+ visit.stop();+ }++ });+ }appendMore(target, offset, count);@@ -63,16 +75,6 @@ public abstract class InfiniteScrollBehavior extends AbstractPostAjaxBehavior {protected abstract void appendMore(AjaxRequestTarget target, int offset, int count);public void refresh(IPartialPageRequestHandler handler) {- WebMarkupContainer container = (WebMarkupContainer) getComponent();- container.visitChildren(RepeatingView.class, new IVisitor<RepeatingView, Void>() {-- @Override- public void component(RepeatingView component, IVisit<Void> visit) {- component.removeAll();- visit.stop();- }-- });handler.appendJavaScript(String.format("onedev.server.infiniteScroll.refresh('%s');",getComponent().getMarkupId()));}diff --git a/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js b/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.jsindex ce834243e5..361504f917 100644--- a/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js+++ b/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js@@ -19,14 +19,16 @@ onedev.server.infiniteScroll = {},refresh: function(containerId) {var $container = $("#" + containerId);- $container.data("scrollTop", $container.scrollTop());- var $items = onedev.server.infiniteScroll.getItems($container);- $items.remove();- $container.scrollTop(0);- $container.data("prevItems", 0);- var pageSize = $container.data("pageSize");- $container.data("callback")(0, pageSize);- $container.data("appending", true);+ if (!$container.data("appending")) {+ $container.data("scrollTop", $container.scrollTop());+ var $items = onedev.server.infiniteScroll.getItems($container);+ $items.remove();+ $container.scrollTop(0);+ $container.data("prevItems", 0);+ var pageSize = $container.data("pageSize");+ $container.data("callback")(0, pageSize);+ $container.data("appending", true);+ }},check: function(containerId) {var $container = $("#" + containerId);diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.js b/core/src/main/java/io/onedev/server/web/page/base/base.jsindex 942e713502..29a0c0d478 100644--- a/core/src/main/java/io/onedev/server/web/page/base/base.js+++ b/core/src/main/java/io/onedev/server/web/page/base/base.js@@ -259,7 +259,7 @@ onedev.server = {$ajaxLoadingIndicator[0].timer = setTimeout(function() {if (!$ajaxLoadingIndicator.is(":visible") && $(".ajax-indicator:visible").length == 0)$ajaxLoadingIndicator.show();- }, 2000);+ }, 1000);}ongoingAjaxRequests++;});@@ -380,18 +380,21 @@ onedev.server = {},setupWebsocketCallback: function() {+ var messagesToSent = [];+ function sendMessages() {+ if (onedev.server.ajaxRequests.count == 0) {+ for (var i in messagesToSent)+ Wicket.WebSocket.send(messagesToSent[i]);+ messagesToSent = [];+ }+ setTimeout(sendMessages, 0);+ }+ sendMessages();+Wicket.Event.subscribe("/websocket/message", function(jqEvent, message) {if (message.indexOf("ObservableChanged:") != -1) {- function requestToRender() {- if (onedev.server.ajaxRequests.count != 0) {- setTimeout(function() {- requestToRender();- }, 10);- } else {- Wicket.WebSocket.send(message);- }- }- requestToRender();+ if (messagesToSent.indexOf(message) == -1)+ messagesToSent.push(message);} else if (message == "ErrorMessage") {$("#websocket-error").show();}diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.javaindex b7be62809e..72db25b912 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java@@ -10,7 +10,6 @@ import javax.annotation.Nullable;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;@@ -80,7 +79,6 @@ import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;import io.onedev.server.web.page.project.savedquery.SaveQueryPanel;import io.onedev.server.web.page.project.savedquery.SavedQueriesPanel;import io.onedev.server.web.util.VisibleVisitor;-import io.onedev.server.web.util.ajaxlistener.ShowGlobalLoadingIndicatorImmediatelyListener;import io.onedev.server.web.util.model.CommitRefsModel;import io.onedev.utils.StringUtils;@@ -408,12 +406,6 @@ public class ProjectCommitsPage extends ProjectPage {foot.add(new AjaxLink<Void>("more") {- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ShowGlobalLoadingIndicatorImmediatelyListener());- }-@Overridepublic void onClick(AjaxRequestTarget target) {state.page = state.page+1;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.javaindex 1af119a83d..7aaf64f368 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java@@ -9,7 +9,6 @@ import org.apache.commons.lang3.SerializationUtils;import org.apache.shiro.authz.UnauthorizedException;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.attributes.CallbackParameter;import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.head.IHeaderResponse;@@ -36,7 +35,6 @@ import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.page.project.issues.list.IssueListPage;-import io.onedev.server.web.util.ajaxlistener.AppendLoadingIndicatorListener;@SuppressWarnings("serial")abstract class BacklogColumnPanel extends Panel {@@ -83,12 +81,6 @@ abstract class BacklogColumnPanel extends Panel {add(new ModalLink("addCard") {- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new AppendLoadingIndicatorListener(false));- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {return new NewCardPanel(id) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex 869d5737f3..d2c1313d62 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -4,7 +4,6 @@ import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.attributes.CallbackParameter;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.event.Broadcast;@@ -40,7 +39,6 @@ import io.onedev.server.web.component.modal.ModalPanel.Size;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QueryPositionSupport;-import io.onedev.server.web.util.ajaxlistener.AppendLoadingIndicatorListener;@SuppressWarnings("serial")abstract class BoardCardPanel extends GenericPanel<Issue> {@@ -120,12 +118,6 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {add(new ModalLink("detail", Size.LARGE) {- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new AppendLoadingIndicatorListener(false));- }-private Component newCardDetail(String id, ModalPanel modal, IModel<Issue> issueModel, QueryPosition position) {return new CardDetailPanel(id, issueModel) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex 70e3933f78..04e883c4de 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -13,7 +13,6 @@ import org.apache.commons.lang3.SerializationUtils;import org.apache.shiro.authz.UnauthorizedException;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.attributes.CallbackParameter;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.event.IEvent;@@ -63,7 +62,6 @@ import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.page.project.issues.list.IssueListPage;import io.onedev.server.web.util.ComponentContext;-import io.onedev.server.web.util.ajaxlistener.AppendLoadingIndicatorListener;@SuppressWarnings("serial")abstract class BoardColumnPanel extends Panel implements EditContext {@@ -261,12 +259,6 @@ abstract class BoardColumnPanel extends Panel implements EditContext {head.add(new ModalLink("addCard") {- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new AppendLoadingIndicatorListener(false));- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {return new NewCardPanel(id) {@@ -320,7 +312,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {target.appendJavaScript(String.format("onedev.server.issueBoards.markAccepted(%d, %b);",issue.getId(), accepted));}-+@Overrideprotected void respond(AjaxRequestTarget target) {IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();@@ -384,6 +376,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {};} else {+ issue.removeFields(transitionRef.get().getRemoveFields());OneDev.getInstance(IssueChangeManager.class).changeState(issue, getColumn(), new HashMap<>(), null, SecurityUtils.getUser());markAccepted(target, issue, true);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.cssindex 0986e4a0db..03c4a03227 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css@@ -74,7 +74,7 @@}#issue-boards>.body>.column>.content>.head .badge {margin-left: 8px;- margin-top: 3px;+ margin-top: 2px;font-size: 10px;}#issue-boards>.body>.column>.content>.head a {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.jsindex 428ece40d8..4f895405c2 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js@@ -48,6 +48,8 @@ onedev.server.issueBoards = {appendTo: $body.parent().closest(".body"),scroll: false,start: function(event, ui) {+ // pretend that we are in ajax operation to prevent websocket auto-update while dragging+ onedev.server.ajaxRequests.count++;$card.addClass("issue-dragging");$(ui.helper).outerWidth($card.outerWidth());bodyContentWidth = $body.prop("scrollWidth");@@ -82,6 +84,7 @@ onedev.server.issueBoards = {if (!accepted) {$card.removeClass("issue-dragging");}+ onedev.server.ajaxRequests.count--;} else {setTimeout(checkAccepted, 10);}@@ -90,6 +93,7 @@ onedev.server.issueBoards = {checkAccepted();} else {$card.removeClass("issue-dragging");+ onedev.server.ajaxRequests.count--;}$card.removeData("droppedTo");$("#issue-boards .body .body").removeClass("issue-droppable");