From 4fcac9d2cbdafb51e3ee9ca3b3da64fd86103174 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 26 Nov 2013 15:58:15 -0500
Subject: [PATCH] Remove artifact setting from manager dialog
---
src/main/java/com/gitblit/wicket/pages/MetricsPage.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/MetricsPage.java b/src/main/java/com/gitblit/wicket/pages/MetricsPage.java
index 5904a64..d4cfc8e 100644
--- a/src/main/java/com/gitblit/wicket/pages/MetricsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/MetricsPage.java
@@ -28,7 +28,6 @@
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
import org.eclipse.jgit.lib.Repository;
-import org.wicketstuff.googlecharts.Chart;
import org.wicketstuff.googlecharts.ChartAxis;
import org.wicketstuff.googlecharts.ChartAxisType;
import org.wicketstuff.googlecharts.ChartProvider;
@@ -41,8 +40,12 @@
import com.gitblit.models.Metric;
import com.gitblit.utils.MetricUtils;
import com.gitblit.utils.StringUtils;
+import com.gitblit.wicket.CacheControl;
+import com.gitblit.wicket.CacheControl.LastModified;
import com.gitblit.wicket.WicketUtils;
+import com.gitblit.wicket.charting.SecureChart;
+@CacheControl(LastModified.REPOSITORY)
public class MetricsPage extends RepositoryPage {
public MetricsPage(PageParameters params) {
@@ -85,9 +88,9 @@
provider.addAxis(commitAxis);
provider.setLineStyles(new LineStyle[] { new LineStyle(2, 4, 0), new LineStyle(0, 4, 1) });
- provider.addShapeMarker(new ShapeMarker(MarkerType.CIRCLE, Color.BLUE, 1, -1, 5));
+ provider.addShapeMarker(new ShapeMarker(MarkerType.CIRCLE, Color.decode("#002060"), 1, -1, 5));
- add(new Chart(wicketId, provider));
+ add(new SecureChart(wicketId, provider));
} else {
add(WicketUtils.newBlankImage(wicketId));
}
@@ -112,7 +115,7 @@
String.valueOf((int) WicketUtils.maxValue(metrics)) });
provider.addAxis(commitAxis);
- add(new Chart(wicketId, provider));
+ add(new SecureChart(wicketId, provider));
} else {
add(WicketUtils.newBlankImage(wicketId));
}
@@ -127,7 +130,7 @@
}
ChartProvider provider = new ChartProvider(new Dimension(800, 200), ChartType.PIE, data);
provider.setPieLabels(labels.toArray(new String[labels.size()]));
- add(new Chart(wicketId, provider));
+ add(new SecureChart(wicketId, provider));
} else {
add(WicketUtils.newBlankImage(wicketId));
}
@@ -181,4 +184,9 @@
protected String getPageName() {
return getString("gb.metrics");
}
+
+ @Override
+ protected Class<? extends BasePage> getRepoNavPageClass() {
+ return SummaryPage.class;
+ }
}
--
Gitblit v1.9.1