capture: respect collage limit on collage selection

andi34 · andi34 · commit 8b8a41c6b095 · 2026-01-02T19:16:50.000+01:00
Change-Id: I93e212f881af9162635d3ffd132bbe69de9065bf
diff --git a/api/capture.php b/api/capture.php
@@ -19,6 +19,10 @@
         throw new \Exception('No style provided');
     }
 
+    if (isset($_POST['collageLimit'])) {
+        $config['collage']['limit'] = $_POST['collageLimit'];
+    }
+
     if (!empty($_POST['file']) && (preg_match('/^[a-z0-9_]+\.jpg$/', $_POST['file']) || preg_match('/^[a-z0-9_]+\.(mp4)$/', $_POST['file']))) {
         $file = $_POST['file'];
     } else {
diff --git a/assets/js/core.js b/assets/js/core.js
@@ -562,6 +562,7 @@ const photoBooth = (function () {
         if (api.photoStyle === PhotoStyle.COLLAGE) {
             data.file = currentCollageFile;
             data.collageNumber = api.nextCollageNumber;
+            data.collageLimit = api.collageLimit;
         }
 
         if (api.photoStyle === PhotoStyle.CHROMA) {

Original file line number	Diff line number	Diff line change
`@@ -562,6 +562,7 @@ const photoBooth = (function () {`
`562`	`562`	`if (api.photoStyle === PhotoStyle.COLLAGE) {`
`563`	`563`	`data.file = currentCollageFile;`
`564`	`564`	`data.collageNumber = api.nextCollageNumber;`
	`565`	`+ data.collageLimit = api.collageLimit;`
`565`	`566`	`}`
`566`	`567`
`567`	`568`	`if (api.photoStyle === PhotoStyle.CHROMA) {`