From bee34da6ae0abc72fee576da02de4bd6211761af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Schumm=20=28kyburg=29?= <scmy@zhaw.ch>
Date: Mon, 1 Jun 2026 09:12:35 +0200
Subject: [PATCH 1/3] Display Camera Make

---
 resources/js/components/drawers/PhotoDetails.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/drawers/PhotoDetails.vue b/resources/js/components/drawers/PhotoDetails.vue
index 9231adac2e8..7117f28c1b1 100644
--- a/resources/js/components/drawers/PhotoDetails.vue
+++ b/resources/js/components/drawers/PhotoDetails.vue
@@ -117,7 +117,7 @@
 									src="../../../img/icons/camera.png"
 									class="dark:invert opacity-50 w-6 h-6"
 								/>
-								<span class="text-sm">{{ photoStore.photo.preformatted.model }}</span>
+								<span class="text-sm">{{ photoStore.photo.preformatted.make }} - {{ photoStore.photo.preformatted.model }}</span>
 							</div>
 							<div v-if="photoStore.photo.preformatted.lens" class="flex w-full gap-2 mb-2">
 								<img

From 7e2e0fdd89ec2be3fb42f9177624a72a3c655a64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Schumm=20=28kyburg=29?= <scmy@zhaw.ch>
Date: Mon, 1 Jun 2026 09:31:50 +0200
Subject: [PATCH 2/3] graceful NULL handle for make

as proposed by CodeRabbit
---
 resources/js/components/drawers/PhotoDetails.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/drawers/PhotoDetails.vue b/resources/js/components/drawers/PhotoDetails.vue
index 7117f28c1b1..eed0d6c84b0 100644
--- a/resources/js/components/drawers/PhotoDetails.vue
+++ b/resources/js/components/drawers/PhotoDetails.vue
@@ -117,7 +117,8 @@
 									src="../../../img/icons/camera.png"
 									class="dark:invert opacity-50 w-6 h-6"
 								/>
-								<span class="text-sm">{{ photoStore.photo.preformatted.make }} - {{ photoStore.photo.preformatted.model }}</span>
+								<span class="text-sm">{{ [photoStore.photo.preformatted.make, photoStore.photo.preformatted.model].filter(Boolean).join(' - ') }}</span>
+
 							</div>
 							<div v-if="photoStore.photo.preformatted.lens" class="flex w-full gap-2 mb-2">
 								<img

From b25bdcb6cd15659c989e72c62f414257101f982c Mon Sep 17 00:00:00 2001
From: ildyria <beviguier@gmail.com>
Date: Mon, 1 Jun 2026 14:29:26 +0200
Subject: [PATCH 3/3] Fix duplicata

---
 .../js/components/drawers/PhotoDetails.vue    | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/drawers/PhotoDetails.vue b/resources/js/components/drawers/PhotoDetails.vue
index eed0d6c84b0..d2dc698020d 100644
--- a/resources/js/components/drawers/PhotoDetails.vue
+++ b/resources/js/components/drawers/PhotoDetails.vue
@@ -117,8 +117,7 @@
 									src="../../../img/icons/camera.png"
 									class="dark:invert opacity-50 w-6 h-6"
 								/>
-								<span class="text-sm">{{ [photoStore.photo.preformatted.make, photoStore.photo.preformatted.model].filter(Boolean).join(' - ') }}</span>
-
+								<span class="text-sm">{{ cameraModel }}</span>
 							</div>
 							<div v-if="photoStore.photo.preformatted.lens" class="flex w-full gap-2 mb-2">
 								<img
@@ -229,7 +228,7 @@
 	</aside>
 </template>
 <script setup lang="ts">
-import { Ref, ref, watch } from "vue";
+import { Ref, ref, watch, computed } from "vue";
 import Card from "primevue/card";
 import ProgressSpinner from "primevue/progressspinner";
 import MapInclude from "@/components/gallery/photoModule/MapInclude.vue";
@@ -263,6 +262,24 @@ const albums_loading = ref(false);
 const albums_error = ref(false);
 const albums_cached_photo_id = ref<string | null>(null);
 
+const cameraModel = computed(() => getModel());
+
+function getModel() {
+	if (photoStore.photo === null || photoStore.photo === undefined || photoStore.photo.preformatted.model === null) {
+		return "";
+	}
+
+	if (photoStore.photo.preformatted.make === null || photoStore.photo.preformatted.make === "") {
+		return photoStore.photo.preformatted.model ?? "";
+	}
+
+	if (photoStore.photo.preformatted.model.startsWith(photoStore.photo.preformatted.make)) {
+		return photoStore.photo.preformatted.model;
+	}
+
+	return `${photoStore.photo.preformatted.make} - ${photoStore.photo.preformatted.model}`;
+}
+
 function fetchAlbums(photo_id: string) {
 	if (albums_cached_photo_id.value === photo_id) {
 		return;