From: Dan Brown <redacted>
Date: Thu, 1 Feb 2024 12:55:38 +0000 (+0000)
Subject: Merge branch 'chapter-templates' into development
X-Git-Tag: v24.02~1^2~19
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/779f09bff6767863a4313ae28dc1e0996665369a

Merge branch 'chapter-templates' into development
---

779f09bff6767863a4313ae28dc1e0996665369a
diff --cc dev/api/responses/chapters-create.json
index 2d4044405,1e81a1e63..3711d1cc9
--- a/dev/api/responses/chapters-create.json
+++ b/dev/api/responses/chapters-create.json
@@@ -11,7 -11,7 +11,8 @@@
    "updated_by": 1,
    "owned_by": 1,
    "description_html": "<p>This is a <strong>great new chapter<\/strong> that I've created via the API<\/p>",
+   "default_template_id": 25,
 +  "book_slug": "example-book",
    "tags": [
      {
        "name": "Category",
@@@ -24,4 -24,4 +25,4 @@@
        "order": 0
      }
    ]
--}
++}
diff --cc dev/api/responses/chapters-update.json
index 3dad6aa0c,4d8d0024e..96784dced
--- a/dev/api/responses/chapters-update.json
+++ b/dev/api/responses/chapters-update.json
@@@ -11,7 -11,7 +11,8 @@@
    "updated_by": 1,
    "owned_by": 1,
    "description_html": "<p>This is an <strong>updated chapter<\/strong> that I've altered via the API<\/p>",
+   "default_template_id": 2428,
 +  "book_slug": "example-book",
    "tags": [
      {
        "name": "Category",
@@@ -24,4 -24,4 +25,4 @@@
        "order": 0
      }
    ]
--}
++}
diff --cc tests/Api/ChaptersApiTest.php
index 002046c3a,fdb80a497..e2d6cfc81
--- a/tests/Api/ChaptersApiTest.php
+++ b/tests/Api/ChaptersApiTest.php
@@@ -149,8 -149,8 +151,9 @@@ class ChaptersApiTest extends TestCas
                      'name' => $page->name,
                  ],
              ],
+             'default_template_id' => null,
          ]);
 +        $resp->assertJsonMissingPath('book');
          $resp->assertJsonCount($chapter->pages()->count(), 'pages');
      }