Skip to content

The Unified and Autonomous Development Platform

chore: Point GHSA vulnerabilities to github directly

Robin Shened53ebbac976
diff --git a/server-ee b/server-ee
index 03e605df58..76a75e2c7b 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 03e605df5831a9304543ba7db97c2ed8facf529d
+Subproject commit 76a75e2c7bdedc016320cf8da015d37de2d54ac2
diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
index bca9c45d19..e16f0a6d50 100644
--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
@@ -186,8 +186,8 @@ public class ProblemReportPage extends BuildReportPage {
fragment.add(filesContainer);
PageableListView<ProblemFile> filesView;
- filesContainer.add(filesView = new PageableListView<ProblemFile>("files",
- new LoadableDetachableModel<>() {
+ filesContainer.add(filesView = new PageableListView<>("files",
+ new LoadableDetachableModel<List<ProblemFile>>() {
@Override
protected List<ProblemFile> load() {
@@ -198,7 +198,7 @@ public class ProblemReportPage extends BuildReportPage {
.filter(it -> filePatterns.get().matches(matcher, it.getBlobPath().toLowerCase()))
.collect(toList());
problemFiles.sort(getReport().newProblemFileComparator());
- return problemFiles;
+ return problemFiles;
} else {
var problemFiles = new ArrayList<>(getReport().getProblemFiles());
problemFiles.sort(getReport().newProblemFileComparator());
@@ -246,7 +246,7 @@ public class ProblemReportPage extends BuildReportPage {
state.problemReport = getReportName();
PageParameters params = ProjectBlobPage.paramsOf(getProject(), state);
item.add(new BookmarkablePageLink<Void>("view", ProjectBlobPage.class, params));
-
+
item.add(new Label("tooManyProblems",
"Too many problems, displaying first " + MAX_PROBLEMS_TO_DISPLAY) {
@@ -279,7 +279,7 @@ public class ProblemReportPage extends BuildReportPage {
} else {
if (o2.getRange() != null)
return 1;
- else
+ else
return 0;
}
});
@@ -302,7 +302,7 @@ public class ProblemReportPage extends BuildReportPage {
severityLabel.add(AttributeAppender.append("class", "badge-warning"));
else
severityLabel.add(AttributeAppender.append("class", "badge-secondary"));
-
+
item.add(new Label("message", problem.getMessage()).setEscapeModelStrings(false));
if (problem.getRange() != null) {
@@ -334,9 +334,14 @@ public class ProblemReportPage extends BuildReportPage {
item.setOutputMarkupId(true);
}
+ @Override
+ protected void onBeforeRender() {
+ expandedFiles.clear();
+ if (!getModelObject().isEmpty())
+ expandedFiles.add(getModelObject().iterator().next().getBlobPath());
+ super.onBeforeRender();
+ }
});
- if (!filesView.getModelObject().isEmpty())
- expandedFiles.add(filesView.getModelObject().iterator().next().getBlobPath());
filesContainer.add(new OnePagingNavigator("pagingNavigator", filesView, null));
filesContainer.add(new NoRecordsPlaceholder("noRecords", filesView));