self-hosted/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-01-13 15:35:15 +02:00
Code Issues Releases Activity

fix(web): always show asset owner when viewing an asset from a shared album (#7104)

Browse Source 
fix: always show album owner when viewing a shared album
This commit is contained in:
martin 2024-02-14 15:08:33 +01:00 committed by GitHub
parent d8631a00bb
commit 6f5648569a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/lib/components/asset-viewer/asset-viewer.svelte
View File

@ -736,7 +736,7 @@
> >
<DetailPanel <DetailPanel
{asset} {asset}
albumId={album?.id} currentAlbum={album}
albums={appearsInAlbums} albums={appearsInAlbums}
on:close={() => ($isShowDetail = false)} on:close={() => ($isShowDetail = false)}
on:closeViewer={handleCloseViewer} on:closeViewer={handleCloseViewer}

10
web/src/lib/components/asset-viewer/detail-panel.svelte
View File

@ -38,7 +38,7 @@
export let asset: AssetResponseDto; export let asset: AssetResponseDto;
export let albums: AlbumResponseDto[] = []; export let albums: AlbumResponseDto[] = [];
export let albumId: string | null = null; export let currentAlbum: AlbumResponseDto | null = null;
let showAssetPath = false; let showAssetPath = false;
let textArea: HTMLTextAreaElement; let textArea: HTMLTextAreaElement;
@ -268,8 +268,8 @@
on:mouseleave={() => ($boundingBoxesArray = [])} on:mouseleave={() => ($boundingBoxesArray = [])}
> >
<a <a
href="{AppRoute.PEOPLE}/{person.id}?{QueryParameter.PREVIOUS_ROUTE}={albumId href="{AppRoute.PEOPLE}/{person.id}?{QueryParameter.PREVIOUS_ROUTE}={currentAlbum?.id
? `${AppRoute.ALBUMS}/${albumId}` ? `${AppRoute.ALBUMS}/${currentAlbum?.id}`
: AppRoute.PHOTOS}" : AppRoute.PHOTOS}"
on:click={() => dispatch('closeViewer')} on:click={() => dispatch('closeViewer')}
> >
@ -630,8 +630,8 @@
</div> </div>
{/if} {/if}
{#if asset.owner && !isOwner} {#if currentAlbum && currentAlbum.sharedUsers.length > 0 && asset.owner}
<section class="px-6 pt-6 dark:text-immich-dark-fg"> <section class="px-6 dark:text-immich-dark-fg">
<p class="text-sm">SHARED BY</p> <p class="text-sm">SHARED BY</p>
<div class="flex gap-4 pt-4"> <div class="flex gap-4 pt-4">
<div> <div>