Skip to content

The Unified and Autonomous Development Platform

fix: some input helper no longer works (#1498)

Robin Shen19e67cd1b2aa
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/MultilineAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/MultilineAssistBehavior.java
index 336b11e0f7..3090e8f92f 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/MultilineAssistBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/MultilineAssistBehavior.java
@@ -13,7 +13,7 @@ import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
public abstract class MultilineAssistBehavior extends InputAssistBehavior {
public MultilineAssistBehavior() {
- super(true);
+ super(false);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java
index 0e5c0f7302..eb33701afc 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java
@@ -28,7 +28,7 @@ public abstract class ReferenceInputBehavior extends InputAssistBehavior {
private static final Pattern SPACE_PATTERN = Pattern.compile("\\s+");
public ReferenceInputBehavior() {
- super(true);
+ super(false);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/stats/pullrequest/PullRequestStatsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/stats/pullrequest/PullRequestStatsPanel.java
index 34c33a0620..24c08fa5b4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/stats/pullrequest/PullRequestStatsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/stats/pullrequest/PullRequestStatsPanel.java
@@ -84,7 +84,7 @@ public class PullRequestStatsPanel extends Panel {
cssClass = "link-success";
break;
default:
- cssClass = "link-danger";
+ cssClass = "link-secondary";
break;
}
statusLink.add(AttributeAppender.append("class", cssClass));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusBadge.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusBadge.java
index c5fd24c861..74d95470d9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusBadge.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusBadge.java
@@ -40,7 +40,7 @@ public class RequestStatusBadge extends Label {
case MERGED:
return "badge badge-success request-status";
default:
- return "badge badge-danger request-status";
+ return "badge badge-secondary request-status";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/ProjectPathEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/ProjectPathEditSupport.java
index 9bdff4f982..f4fc1ac9e5 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/ProjectPathEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/ProjectPathEditSupport.java
@@ -32,7 +32,7 @@ public class ProjectPathEditSupport implements EditSupport {
@Override
public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
- InputAssistBehavior behavior = new InputAssistBehavior(true) {
+ InputAssistBehavior behavior = new InputAssistBehavior(false) {
@Override
protected List<InputCompletion> getSuggestions(InputStatus inputStatus) {
List<InputCompletion> suggestions = new ArrayList<>();
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/SuggestionEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/SuggestionEditSupport.java
index 14e8c8bfd9..39916b53ed 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/SuggestionEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/SuggestionEditSupport.java
@@ -34,7 +34,7 @@ public class SuggestionEditSupport implements EditSupport {
@Override
public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
return new StringPropertyEditor(componentId, descriptor, model).setInputAssist(
- new InputAssistBehavior(true) {
+ new InputAssistBehavior(false) {
@SuppressWarnings("unchecked")
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
index ad0dc8b360..32b7704164 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
@@ -101,7 +101,7 @@
</div>
<div wicket:id="requestOperations" class="operations">
<a wicket:id="merge" class="btn btn-sm btn-outline-success">Merge</a>
- <a wicket:id="discard" class="btn btn-sm btn-outline-danger">Discard</a>
+ <a wicket:id="discard" class="btn btn-sm btn-outline-secondary">Discard</a>
<a wicket:id="approve" class="btn btn-sm btn-outline-primary">Approve</a>
<a wicket:id="requestForChanges" class="btn btn-sm btn-outline-primary">Request For Changes</a>
<a wicket:id="reopen" class="btn btn-sm btn-outline-primary">Reopen</a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 6f73042bfa..54a0519dea 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -1222,7 +1222,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
public String getObject() {
PullRequest request = getPullRequest();
if (request.isDiscarded())
- return " badge-danger";
+ return " badge-secondary";
else if (request.isMerged())
return " badge-success";
else