Skip to content

The Unified and Autonomous Development Platform

Fix some minor bugs

robin shencecd553feb7c
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVerificationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVerificationManager.java
index 0f6b33203d..a4b896194f 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVerificationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVerificationManager.java
@@ -6,6 +6,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -198,7 +199,7 @@ public class DefaultVerificationManager extends AbstractEnvironmentManager imple
if (bytes != null)
return ((Map<String, Date>) SerializationUtils.deserialize(bytes)).keySet();
else
- return null;
+ return new HashSet<>();
}
});
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java
index d46618b0d0..330c6ba7ec 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java
@@ -454,7 +454,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
private ObjectId getOldCommit() {
String oldRev = change.getOldBlobIdent().revision;
- if (oldRev.equals(ObjectId.zeroId().toString())) {
+ if (oldRev.equals(ObjectId.zeroId().name().toString())) {
return ObjectId.zeroId();
} else {
return projectModel.getObject().getRevCommit(oldRev);
@@ -463,7 +463,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
private ObjectId getNewCommit() {
String newRev = change.getNewBlobIdent().revision;
- if (newRev.equals(ObjectId.zeroId().toString())) {
+ if (newRev.equals(ObjectId.zeroId().name().toString())) {
return ObjectId.zeroId();
} else {
return projectModel.getObject().getRevCommit(newRev);
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
index f4f9a93a21..89ed717258 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -1200,7 +1200,7 @@ public class RevisionDiffPanel extends Panel {
}
private ObjectId getOldCommitId() {
- if (oldRev.equals(ObjectId.zeroId().toString())) {
+ if (oldRev.equals(ObjectId.zeroId().name().toString())) {
return ObjectId.zeroId();
} else {
return projectModel.getObject().getRevCommit(oldRev);
@@ -1208,7 +1208,7 @@ public class RevisionDiffPanel extends Panel {
}
private ObjectId getNewCommitId() {
- if (newRev.equals(ObjectId.zeroId().toString())) {
+ if (newRev.equals(ObjectId.zeroId().name().toString())) {
return ObjectId.zeroId();
} else {
return projectModel.getObject().getRevCommit(newRev);
diff --git a/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java b/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java
index 08ef620659..a11e8492ca 100644
--- a/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java
@@ -86,7 +86,7 @@ public abstract class ModalPanel extends Panel {
AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
if (target != null) {
- String script = String.format("gitplex.server.modal.close($('#%s>.modal'), false);", getMarkupId(true));
+ String script = String.format("gitplex.server.modal.close($('#%s'), false);", getMarkupId(true));
target.appendJavaScript(script);
}
remove();
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.html b/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.html
index 016d36da80..131673a1e4 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.html
@@ -95,7 +95,10 @@
</form>
</wicket:fragment>
<wicket:fragment wicket:id="confirmDeleteBranchFrag">
- <div class="modal-header"><h4 class="modal-title">Please confirm</h4></div>
+ <div class="modal-header">
+ <button wicket:id="close" type="button" class="close">&times;</button>
+ <h4 class="modal-title">Please confirm</h4>
+ </div>
<div wicket:id="body" class="modal-body"></div>
<div class="modal-footer">
<a wicket:id="delete" class="btn btn-danger">Delete</a>
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.java b/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.java
index 5ced0f42eb..aec772b757 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.java
@@ -646,6 +646,14 @@ public class ProjectBranchesPage extends ProjectPage {
modal.close();
}
+ });
+ fragment.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ }
+
});
return fragment;
}