StEP #3255

Merge request studip/studip!2355

2 files changed, 11 insertions, 2 deletions

diff --git a/lib/models/Courseware/Block.php b/lib/models/Courseware/Block.php
index b794832..8b3d6f4 100644
--- a/lib/models/Courseware/Block.php
+++ b/lib/models/Courseware/Block.php
@@ -22,6 +22,7 @@ use User;
  * @property int $position database column
  * @property string|null $block_type database column
  * @property int $visible database column
+ * @property int $commentable database column
  * @property string $payload database column
  * @property int $mkdate database column
  * @property int $chdate database column
@@ -172,6 +173,7 @@ class Block extends \SimpleORMap implements \PrivacyObject
                 'block-type'=> $this->type->getType(),
                 'title'=> $this->type->getTitle(),
                 'visible'=> $this->visible,
+                'commentable' => $this->commentable,
                 'payload'=> $this->type->getPayload(),
                 'mkdate'=> $this->mkdate,
                 'chdate'=> $this->chdate
@@ -204,6 +206,7 @@ class Block extends \SimpleORMap implements \PrivacyObject
             'block_type' => $this->type->getType(),
             'payload' => json_encode($this->type->copyPayload($rangeId)),
             'visible' => 1,
+            'commentable' => 0
         ]);
 
         //update Container payload
@@ -227,6 +230,7 @@ class Block extends \SimpleORMap implements \PrivacyObject
             'block_type' => $data->attributes->{'block-type'},
             'payload' => json_encode($data->attributes->payload),
             'visible' => 1,
+            'commentable' => 0
         ]);
 
         $block->payload = json_encode($block->type->copyPayload($rangeId));
diff --git a/lib/models/Courseware/StructuralElement.php b/lib/models/Courseware/StructuralElement.php
index 34cef80..a63c73f 100644
--- a/lib/models/Courseware/StructuralElement.php
+++ b/lib/models/Courseware/StructuralElement.php
@@ -31,6 +31,7 @@ use User;
  * @property string|null $purpose database column
  * @property \JSONArrayObject $payload database column
  * @property int $public database column
+ * @property int $commentable database column
  * @property int $release_date database column
  * @property int $withdraw_date database column
  * @property \JSONArrayObject $read_approval database column
@@ -758,6 +759,7 @@ class StructuralElement extends \SimpleORMap implements \PrivacyObject
             'owner_id' => $user->id,
             'editor_id' => $user->id,
             'title' => _('neue Seite'),
+            'commentable' => 0
         ]);
 
         $struct->store();
@@ -841,6 +843,7 @@ SQL;
             'purpose' => $purpose ?: $this->purpose,
             'position' => 0,
             'payload' => $this->payload,
+            'commentable' => 0
         ]);
 
         $element->store();
@@ -892,7 +895,8 @@ SQL;
             'image_id' => $image_id,
             'image_type' => $this->image_type,
             'read_approval' => $parent->read_approval,
-            'write_approval' => $parent->write_approval
+            'write_approval' => $parent->write_approval,
+            'commentable' => 0
         ]);
 
         $element->store();
@@ -1032,7 +1036,8 @@ SQL;
             'position' => $parent->countChildren(),
             'payload' => $this->payload,
             'read_approval' => $parent->read_approval,
-            'write_approval' => $parent->write_approval
+            'write_approval' => $parent->write_approval,
+            'commentable' => 0
         ]);
 
         $element->store();