kevinsivic/dawarich
1
0
Fork 0
mirror of https://github.com/Freika/dawarich.git synced 2026-01-10 17:21:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Consider both Immich and Photoprism integrations in trips controller

Browse source
This commit is contained in:
Eugene Burmakin 2024-12-03 15:12:20 +01:00
parent 83078c5b29
commit 42b74ecd52
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/controllers/trips_controller.js
View file

@ -80,10 +80,10 @@ export default class extends Controller {
this.map.on('overlayadd', (e) => {
if (e.name !== 'Photos') return;
if (!this.userSettings.immich_url || !this.userSettings.immich_api_key) {
if ((!this.userSettings.immich_url || !this.userSettings.immich_api_key) && (!this.userSettings.photoprism_url || !this.userSettings.photoprism_api_key)) {
showFlashMessage(
'error',
'Immich integration is not configured. Please check your settings.'
'Photos integration is not configured. Please check your integrations settings.'
);
return;
}

2
app/javascript/maps/helpers.js
View file

@ -159,7 +159,7 @@ export async function fetchAndDisplayPhotos({ map, photoMarkers, apiKey, startDa
start_date: startDate,
end_date: endDate
});
console.log(startDate, endDate);
const response = await fetch(`/api/v1/photos?${params}`);
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}, response: ${response.body}`);