fix bug where updating settings would remove the header image

LycheeOrg · Oct 7, 2024 · 45bb7bf · 45bb7bf
1 parent 283c74d
commit 45bb7bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/app/Actions/Album/SetHeader.php b/app/Actions/Album/SetHeader.php
@@ -14,15 +14,16 @@ class SetHeader extends Action
 	 * @param Album  $album
 	 * @param bool   $is_compact
 	 * @param ?Photo $photo
+	 * @param bool   $shall_override
 	 *
 	 * @return Album
 	 */
-	public function do(Album $album, bool $is_compact, ?Photo $photo): Album
+	public function do(Album $album, bool $is_compact, ?Photo $photo, bool $shall_override = false): Album
 	{
 		if ($is_compact) {
 			$album->header_id = AlbumController::COMPACT_HEADER;
 		} else {
-			$album->header_id = ($album->header_id === $photo?->id) ? null : $photo?->id;
+			$album->header_id = ($album->header_id !== $photo?->id || $shall_override) ? $photo?->id : null;
 		}
 		$album->save();
 

diff --git a/app/Http/Controllers/Gallery/AlbumController.php b/app/Http/Controllers/Gallery/AlbumController.php
@@ -111,7 +111,11 @@ public function updateAlbum(UpdateAlbumRequest $request, SetHeader $setHeader):
 		$album->photo_sorting = $request->photoSortingCriterion();
 		$album->album_sorting = $request->albumSortingCriterion();
 
-		$album = $setHeader->do($album, $request->is_compact(), $request->photo());
+		$album = $setHeader->do(
+			album: $album,
+			is_compact: $request->is_compact(),
+			photo: $request->photo(),
+			shall_override: true);
 
 		return EditableBaseAlbumResource::fromModel($album);
 	}