Skip to content

Commit

Permalink
re-order subelements after selected node was moved
Browse files Browse the repository at this point in the history
  • Loading branch information
rsehr committed Oct 7, 2024
1 parent 1496699 commit 31e2cb3
Showing 1 changed file with 16 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1722,7 +1722,9 @@ public void moveNode() {
destinationEntry.addSubEntry(selectedEntry);
destinationEntry.reOrderElements();
selectedEntry.updateHierarchy();
ArchiveManagementManager.saveNode(recordGroup.getId(), selectedEntry);
List<IEadEntry> nodesToUpdate = selectedEntry.getAllNodes();
ArchiveManagementManager.saveNodes(recordGroup.getId(), nodesToUpdate);

setSelectedEntry(selectedEntry);
displayMode = "";
flatEntryList = null;
Expand Down Expand Up @@ -1759,6 +1761,9 @@ public void moveNodeUp() {
ArchiveManagementManager.saveNode(recordGroup.getId(), previousNode);
ArchiveManagementManager.saveNode(recordGroup.getId(), selectedEntry);
selectedEntry.getParentNode().sortElements();
selectedEntry.updateHierarchy();
List<IEadEntry> nodesToUpdate = selectedEntry.getAllNodes();
ArchiveManagementManager.saveNodes(recordGroup.getId(), nodesToUpdate);

flatEntryList = null;

Expand Down Expand Up @@ -1794,7 +1799,9 @@ public void moveNodeDown() {
ArchiveManagementManager.saveNode(recordGroup.getId(), followingNode);
ArchiveManagementManager.saveNode(recordGroup.getId(), selectedEntry);
selectedEntry.getParentNode().sortElements();

selectedEntry.updateHierarchy();
List<IEadEntry> nodesToUpdate = selectedEntry.getAllNodes();
ArchiveManagementManager.saveNodes(recordGroup.getId(), nodesToUpdate);
flatEntryList = null;

}
Expand All @@ -1819,6 +1826,9 @@ public void moveHierarchyDown() {
// move node to prev.
destinationEntry = previousNode;
destinationEntry.setDisplayChildren(true);
destinationEntry.updateHierarchy();
List<IEadEntry> nodesToUpdate = destinationEntry.getAllNodes();
ArchiveManagementManager.saveNodes(recordGroup.getId(), nodesToUpdate);
moveNode();
}

Expand Down Expand Up @@ -1847,7 +1857,11 @@ public void moveHierarchyUp() {
if (selectedEntry.getOrderNumber().intValue() != oldParent.getOrderNumber().intValue() + 1) {
Collections.swap(selectedEntry.getParentNode().getSubEntryList(), selectedEntry.getOrderNumber(), oldParent.getOrderNumber() + 1);
selectedEntry.getParentNode().reOrderElements();
selectedEntry.getParentNode().updateHierarchy();
List<IEadEntry> nodesToUpdate = selectedEntry.getParentNode().getAllNodes();
ArchiveManagementManager.saveNodes(recordGroup.getId(), nodesToUpdate);
}

}

public void searchAdvanced() {
Expand Down

0 comments on commit 31e2cb3

Please sign in to comment.