Merge branch 'fix'

haikoschol · Mar 1, 2025 · fc96ee0 · fc96ee0
2 parents 77e08cf + a8c4057
commit fc96ee0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/photos/static/photos/components/uploader.js b/photos/static/photos/components/uploader.js
@@ -163,8 +163,12 @@ class CoaUploader extends HTMLElement {
         this.metadata.city = this.city.value
         this.metadata.country = this.country.value
 
-        await this.addPhoto(this.metadata)
-        Toast(`Uploaded file ${this.metadata.filename} successfully`)
+        const uploadRes = await this.addPhoto(this.metadata)
+        if (uploadRes.success) {
+            Toast(`Uploaded file ${this.metadata.filename} successfully`)
+        } else {
+            ErrorToast(`Uploading file ${this.metadata.filename} failed`)
+        }
     }
 
     populateForm() {

diff --git a/photos/views.py b/photos/views.py
@@ -136,11 +136,17 @@ def add_photo(request, metadata: dict[str, object]):
     coords = Coordinates.objects.filter(point=p).first()
 
     if not coords:
-        loc, _ = Location.objects.get_or_create(
+        loc = Location.objects.filter(
             city=pm.city,
             country=pm.country,
-            tzoffset=pm.tzoffset,
-        )
+        ).first()
+
+        if not loc:
+            loc = Location.objects.create(
+                city=pm.city,
+                country=pm.country,
+                tzoffset=pm.tzoffset, # this is probably wrong
+            )
 
         coords = Coordinates.objects.create(
             point=p,