Skip to content

The Unified and Autonomous Development Platform

chore: Improved dashboard widget placement

Robin Shena2eb32f16d22
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 e7909669ee..e819ee5668 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
@@ -7317,4 +7317,18 @@ public class DataMigrator {
}
}
}
+
+ private void migrate187(File dataDir, Stack<Integer> versions) {
+ for (File file : dataDir.listFiles()) {
+ if (file.getName().startsWith("Dashboards.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ for (var widgetElement : element.element("widgets").elements())
+ widgetElement.element("autoHeight").detach();
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/model/support/widget/Widget.java b/server-core/src/main/java/io/onedev/server/model/support/widget/Widget.java
index ba3609f48c..208797a47c 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/widget/Widget.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/widget/Widget.java
@@ -21,8 +21,6 @@ public class Widget implements Serializable {
private int right;
private int bottom;
-
- private boolean autoHeight = true;
@Editable(order=100, name="Tabs")
@Size(min=1, message = "At least one tab should be added")
@@ -33,18 +31,7 @@ public class Widget implements Serializable {
public void setTabs(List<WidgetTab> tabs) {
this.tabs = tabs;
}
-
- @Editable(order=100000, description = "Adjust widget height automatically to show its content " +
- "in dashboard view mode. It also extend to fill the gap between current widget and " +
- "the widget beneath it, or extend to page bottom if no widgets beneath it")
- public boolean isAutoHeight() {
- return autoHeight;
- }
- public void setAutoHeight(boolean autoHeight) {
- this.autoHeight = autoHeight;
- }
-
public int getLeft() {
return left;
}
diff --git a/server-ee b/server-ee
index fc4dd64bec..a18dd277ec 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit fc4dd64bec400e259eb8a6f38a8f4703f0cacd15
+Subproject commit a18dd277ecb8ba0944e7939300b900fc2011c188