aboutsummaryrefslogtreecommitdiff
path: root/lib/classes/JsonApi
diff options
context:
space:
mode:
authorRon Lucke <lucke@elan-ev.de>2024-02-02 07:30:38 +0000
committerRon Lucke <lucke@elan-ev.de>2024-02-02 07:30:38 +0000
commit9b70c496fd62de9d7f7a3440837df7d026c8a2b1 (patch)
tree0a0edf2117e6976280819272dc9e5c1a4ee17cd3 /lib/classes/JsonApi
parentd33baf07ea43bdfa970969e2b026526ef3e6c4a0 (diff)
fix #2925
Closes #2925 Merge request studip/studip!2483
Diffstat (limited to 'lib/classes/JsonApi')
-rw-r--r--lib/classes/JsonApi/Routes/Courseware/StructuralElementsSharedIndex.php14
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/classes/JsonApi/Routes/Courseware/StructuralElementsSharedIndex.php b/lib/classes/JsonApi/Routes/Courseware/StructuralElementsSharedIndex.php
index 0dc7c0d..1582fbf 100644
--- a/lib/classes/JsonApi/Routes/Courseware/StructuralElementsSharedIndex.php
+++ b/lib/classes/JsonApi/Routes/Courseware/StructuralElementsSharedIndex.php
@@ -42,9 +42,9 @@ class StructuralElementsSharedIndex extends JsonApiController
}
list($offset, $limit) = $this->getOffsetAndLimit();
- $resources = [];
+ $elements = [];
$contents = StructuralElement::findBySQL(
- 'range_id != ? AND range_type = ? ORDER BY mkdate DESC',
+ 'range_id != ? AND range_type = ? ORDER BY mkdate ASC',
[$user->id, 'user']
);
@@ -68,7 +68,15 @@ class StructuralElementsSharedIndex extends JsonApiController
}
if ($add_content) {
- $resources[] = $content;
+ $elements[] = $content;
+ }
+ }
+
+ $resources = [];
+ foreach ($elements as $element) {
+ $has_parent = array_column($elements, null, 'id')[$element->parent_id] ?? false;
+ if (!$has_parent) {
+ $resources[] = $element;
}
}