Skip to content

The Unified and Autonomous Development Platform

feat: Able to disable dashboard via system setting (OD-2037)

Robin Shend96a65d27375
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index 21208b3bea..2dd903a930 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -6949,5 +6949,18 @@ public class DataMigrator {
}
historiesDom.writeToFile(historiesDomFile, true);
}
+
+ private void migrate175(File dataDir, Stack<Integer> versions) {
+ for (File file : dataDir.listFiles()) {
+ if (file.getName().startsWith("Settings.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ if (element.elementTextTrim("key").equals("SYSTEM"))
+ element.element("value").addElement("disableDashboard").setText("false");
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
index c14f17ca88..6fd2a9babd 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
@@ -9,6 +9,8 @@ import javax.validation.ConstraintValidatorContext;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
+import io.onedev.server.annotation.ShowCondition;
+import io.onedev.server.web.util.WicketUtils;
import org.apache.commons.lang3.StringUtils;
import javax.validation.constraints.NotEmpty;
@@ -45,6 +47,8 @@ public class SystemSetting implements Serializable, Validatable {
private boolean disableAutoUpdateCheck;
+ private boolean disableDashboard;
+
private boolean gravatarEnabled;
@Editable(name="Server URL", order=90, description="Specify root URL to access this server")
@@ -130,6 +134,20 @@ public class SystemSetting implements Serializable, Validatable {
this.disableAutoUpdateCheck = disableAutoUpdateCheck;
}
+ @Editable(order=450)
+ @ShowCondition("isDisableDashboardEnabled")
+ public boolean isDisableDashboard() {
+ return disableDashboard;
+ }
+
+ public void setDisableDashboard(boolean disableDashboard) {
+ this.disableDashboard = disableDashboard;
+ }
+
+ private static boolean isDisableDashboardEnabled() {
+ return WicketUtils.isSubscriptionActive();
+ }
+
@Editable(order=500, description="Whether or not to enable user gravatar (https://gravatar.com)")
public boolean isGravatarEnabled() {
return gravatarEnabled;
diff --git a/server-ee b/server-ee
index 754cba7684..8b9d4008a4 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 754cba7684218d074934edeab9a86118629afecb
+Subproject commit 8b9d4008a450bbc09da4ed6dba0870b52ad798e1