aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRon Lucke <lucke@elan-ev.de>2023-01-31 09:02:38 +0000
committerElmar Ludwig <elmar.ludwig@uni-osnabrueck.de>2023-01-31 09:02:38 +0000
commitef8f85c9bd02675a3e250e48ecdc22cd66af4a9b (patch)
tree46593b7188fe4bd848d5754d1737d592316e2d55 /lib
parent2a8091c0f8e625a70e72dbe6438a74af14451978 (diff)
Vererbung von Lese- und Schreibrechten in CW
Closes #2102 and #2094 Merge request studip/studip!1360
Diffstat (limited to 'lib')
-rw-r--r--lib/classes/JsonApi/Routes/Courseware/StructuralElementsCreate.php4
-rw-r--r--lib/models/Courseware/StructuralElement.php4
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/classes/JsonApi/Routes/Courseware/StructuralElementsCreate.php b/lib/classes/JsonApi/Routes/Courseware/StructuralElementsCreate.php
index 47ada63..4283111 100644
--- a/lib/classes/JsonApi/Routes/Courseware/StructuralElementsCreate.php
+++ b/lib/classes/JsonApi/Routes/Courseware/StructuralElementsCreate.php
@@ -81,8 +81,8 @@ class StructuralElementsCreate extends JsonApiController
'title' => self::arrayGet($json, 'data.attributes.title', ''),
'purpose' => self::arrayGet($json, 'data.attributes.purpose', $parent->purpose),
'payload' => self::arrayGet($json, 'data.attributes.payload', ''),
- 'read_approval' => self::arrayGet($json, 'data.attributes.read-approval', []),
- 'write_approval' => self::arrayGet($json, 'data.attributes.write-approval', []),
+ 'read_approval' => $parent->read_approval,
+ 'write_approval' => $parent->write_approval,
'position' => $parent->countChildren()
]);
diff --git a/lib/models/Courseware/StructuralElement.php b/lib/models/Courseware/StructuralElement.php
index ba51238..c7087a7 100644
--- a/lib/models/Courseware/StructuralElement.php
+++ b/lib/models/Courseware/StructuralElement.php
@@ -837,6 +837,8 @@ SQL;
'position' => $parent->countChildren(),
'payload' => $this->payload,
'image_id' => $file_ref_id,
+ 'read_approval' => $parent->read_approval,
+ 'write_approval' => $parent->write_approval
]);
$element->store();
@@ -944,6 +946,8 @@ SQL;
'purpose' => $this->purpose,
'position' => $parent->countChildren(),
'payload' => $this->payload,
+ 'read_approval' => $parent->read_approval,
+ 'write_approval' => $parent->write_approval
]);
$element->store();