Skip to content

The Unified and Autonomous Development Platform

Fix some minor bugs

Robin Sheneb6c9812c8bd
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
index 4f2c04a944..983da74692 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
@@ -38,7 +38,10 @@ public class MilestoneCriteria extends IssueCriteria {
@Override
public boolean matches(Issue issue, User user) {
- return issue.getMilestone() != null && issue.getMilestone().getName().equals(value);
+ if (value != null)
+ return issue.getMilestone() != null && issue.getMilestone().getName().equals(value);
+ else
+ return issue.getMilestone() == null;
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.java
index 4a7ca3035c..e66942ec9c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.java
@@ -29,8 +29,8 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.avatar.AvatarLink;
-import io.onedev.server.web.component.modal.ModalLink;
-import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;
@SuppressWarnings("serial")
@@ -66,7 +66,9 @@ class BoardCardPanel extends GenericPanel<Issue> {
.findByName(field.getValues().iterator().next());
if (user != null) {
String tooltip = field.getName() + ": " + user.getDisplayName();
- avatarsView.add(new AvatarLink(avatarsView.newChildId(), user, tooltip));
+ AvatarLink link = new AvatarLink(avatarsView.newChildId(), user, null);
+ link.add(AttributeAppender.append("title", tooltip));
+ avatarsView.add(link);
}
}
}
@@ -91,15 +93,15 @@ class BoardCardPanel extends GenericPanel<Issue> {
});
- add(new ModalLink("detail") {
+ add(new DropdownLink("detail") {
@Override
- protected Component newContent(String id, ModalPanel modal) {
+ protected Component newContent(String id, FloatingPanel dropdown) {
return new CardDetailPanel(id, BoardCardPanel.this.getModel()) {
@Override
protected void onClose(AjaxRequestTarget target) {
- modal.close();
+ dropdown.close();
}
};
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css
index 49b3c6433b..88823998ba 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css
@@ -148,7 +148,7 @@
margin-right: 0;
}
#issue-boards>.body .card .avatars>.avatar {
- margin-right: 4px;
+ margin-right: 6px;
}
#issue-boards>.body .card .avatars>.avatar:last-child {
margin-right: 0;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.js b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.js
index d4cbd65f5b..58b321ddc3 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.js
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.js
@@ -107,6 +107,7 @@ onedev.server.issueBoards = {
$body.children(".card").removeClass("first").first().addClass("first");
},
markAccepted: function(issueId, accepted) {
- $("#issue-boards .column .body .ui-draggable[data-issue='" + issueId + "']").data("accepted", accepted);
+ var $card = $("#issue-boards .column .body .ui-draggable.issue-dragging[data-issue='" + issueId + "']");
+ $card.data("accepted", accepted);
}
}
\ No newline at end of file