The Unified and Autonomous Development Platform
fix: Open issues statistics incorrect (OD-2013)
Robin Shen3ae5b0c9ccae
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.javaindex 9b8b820ffc..21208b3bea 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@@ -6866,5 +6866,88 @@ public class DataMigrator {}}}++ private void migrate174(File dataDir, Stack<Integer> versions) {+ String initialState = null;+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("Settings.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ String key = element.elementTextTrim("key");+ if (key.equals("ISSUE")) {+ Element valueElement = element.element("value");+ if (valueElement != null) {+ for (var stateSpecElement: valueElement.element("stateSpecs").elements()) {+ initialState = stateSpecElement.elementText("name").trim();+ break;+ }+ }+ }+ }+ } else if (file.getName().startsWith("IssueStateHistorys.xml")) {+ FileUtils.deleteFile(file);+ }+ }++ Map<Long, List<IssueStateHistory>> histories = new HashMap<>();+ var id = 1L;++ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("Issues.xml")) {+ if (initialState != null) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ var history = new IssueStateHistory();+ history.setId(id++);+ history.setState(initialState);+ history.setDate(parseDate(element.elementText("submitDate")));+ history.setTimeGroups(TimeGroups.of(history.getDate()));+ history.setIssue(new Issue());+ history.getIssue().setId(Long.parseLong(element.elementText("id").trim()));+ histories.computeIfAbsent(history.getIssue().getId(), it -> new ArrayList<>()).add(history);+ }+ }+ } else if (file.getName().startsWith("IssueChanges.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ Element dataElement = element.element("data");+ var className = dataElement.attributeValue("class");+ if (className.contains("IssueStateChangeData")+ || className.contains("IssueBatchUpdateData")) {+ var oldState = dataElement.elementText("oldState").trim();+ var newState = dataElement.elementText("newState").trim();+ if (!oldState.equals(newState)) {+ var history = new IssueStateHistory();+ history.setId(id++);+ history.setState(newState);+ history.setDate(parseDate(element.elementText("date")));+ history.setTimeGroups(TimeGroups.of(history.getDate()));+ history.setIssue(new Issue());+ history.getIssue().setId(Long.parseLong(element.elementText("issue").trim()));+ histories.computeIfAbsent(history.getIssue().getId(), it->new ArrayList<>()).add(history);+ }+ }+ }+ }+ }++ VersionedXmlDoc historiesDom;+ File historiesDomFile = new File(dataDir, "IssueStateHistorys.xml");+ historiesDom = new VersionedXmlDoc();+ Element listElement = historiesDom.addElement("list");++ for (var value: histories.values()) {+ value.sort(comparing(IssueStateHistory::getDate));+ for(int i=0; i<value.size()-1; i++) {+ var history = value.get(i);+ var nextHistory = value.get(i+1);+ history.setDuration(nextHistory.getDate().getTime() - history.getDate().getTime());+ migrate171_createHistoryElement(listElement, history);+ }+ if (!value.isEmpty())+ migrate171_createHistoryElement(listElement, value.get(value.size()-1));+ }+ historiesDom.writeToFile(historiesDomFile, true);+ }}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.htmlindex f38c00b6a7..c6bd4e6a3c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html@@ -66,15 +66,15 @@<wicket:enclosure child="iterations"><table class="iterations table"><tr wicket:id="iterations" class="iteration">- <td class="name">+ <td class="name text-nowrap"><a wicket:id="select"><span wicket:id="name"></span></a><span wicket:id="inherited" class="ml-2 badge badge-info badge-sm">Inherited</span><a wicket:id="burndown" title="Burndown chart" class="ml-2"><wicket:svg href="burndown" class="icon"/></a></td>- <td class="status">+ <td class="status text-nowrap"><span wicket:id="status"></span></td>- <td class="due-date">+ <td class="due-date text-nowrap"><span wicket:id="dueDate"></span></td><td class="actions text-right">diff --git a/server-ee b/server-eeindex 571861209d..8cfcdb4aa7 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 571861209de63b01dc97429392b850aa59aa0644+Subproject commit 8cfcdb4aa7e627ea2fc123b76ca0fe4d78a0e277