Skip to content

The Unified and Autonomous Development Platform

Show default branch on project stats page

Robin Shen690b1cd63554
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html
index 8282efa736..ada680f419 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html
@@ -8,7 +8,7 @@
<option>Deletions</option>
</select>
</div>
- <div class="note">Contributions to default branch, excluding merge commits</div>
+ <div wicket:id="note" class="note"></div>
<div class="overall chart"></div>
<div class="top-contributors container-fluid"></div>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java
index f53e0b4536..d0526a0cc0 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java
@@ -5,6 +5,7 @@ import java.util.Map;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -28,6 +29,12 @@ public class ProjectContribsPage extends ProjectStatsPage {
return SecurityUtils.canReadCode(getProject().getFacade());
}
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Label("note", "Contributions to " + getProject().getDefaultBranch() + " branch, excluding merge commits"));
+ }
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java b/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java
index 74eaa6962d..b877ceb973 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java
@@ -6,6 +6,7 @@ import java.util.Map;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.unbescape.javascript.JavaScriptEscape;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -32,7 +33,8 @@ public class SourceLinesPage extends ProjectStatsPage {
}
try {
String jsonOfData = OneDev.getInstance(ObjectMapper.class).writeValueAsString(data);
- String script = String.format("onedev.server.stats.sourceLines.onDomReady(%s);", jsonOfData);
+ String script = String.format("onedev.server.stats.sourceLines.onDomReady(%s, '%s');",
+ jsonOfData, JavaScriptEscape.escapeJavaScript(getProject().getDefaultBranch()));
response.render(OnDomReadyHeaderItem.forScript(script));
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js b/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
index c5d49e666d..b925b25275 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
@@ -296,7 +296,7 @@ onedev.server.stats = {
}
},
sourceLines: {
- onDomReady: function(lineIncrements) {
+ onDomReady: function(lineIncrements, defaultBranch) {
var numOfTopLanguages = 10;
var $chart = $("#source-lines>.chart");
@@ -363,7 +363,7 @@ onedev.server.stats = {
var useKilo;
var option = {
title: {
- text: 'Source lines of code on default branch',
+ text: 'Source lines of code on ' + defaultBranch + ' branch',
left: 'center',
top: 10
},