Merge pull request #1783 from nextcloud/backport/stable26/artonge/fix…

…/use_display_name [stable26] Use display name instead of id for shared albums
nextcloud · May 15, 2023 · 311132e · 311132e
2 parents bc7a460 + 2282b19
commit 311132e
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/js/photos-main.js b/js/photos-main.js
diff --git a/js/photos-main.js.map b/js/photos-main.js.map
diff --git a/js/photos-public.js b/js/photos-public.js
diff --git a/js/photos-public.js.map b/js/photos-public.js.map
diff --git a/js/photos-src_mixins_FetchAlbumsMixin_js-src_components_Albums_AlbumForm_vue.js b/js/photos-src_mixins_FetchAlbumsMixin_js-src_components_Albums_AlbumForm_vue.js
diff --git a/js/photos-src_mixins_FetchAlbumsMixin_js-src_components_Albums_AlbumForm_vue.js.map b/js/photos-src_mixins_FetchAlbumsMixin_js-src_components_Albums_AlbumForm_vue.js.map
diff --git a/js/photos-src_views_AlbumContent_vue.js b/js/photos-src_views_AlbumContent_vue.js
diff --git a/js/photos-src_views_AlbumContent_vue.js.map b/js/photos-src_views_AlbumContent_vue.js.map
diff --git a/lib/Album/AlbumMapper.php b/lib/Album/AlbumMapper.php
@@ -508,7 +508,7 @@ public function getSharedAlbumsForCollaboratorWithFiles(string $collaboratorId,
 				// Suffix album name with the album owner to prevent duplicates.
 				// Not done for public link as it would like owner's uid.
 				if ($collaboratorType !== self::TYPE_LINK) {
-					$albumName = $row['album_name'].' ('.$row['album_user'].')';
+					$albumName = $row['album_name'].' ('.$this->userManager->get($row['album_user'])->getDisplayName().')';
 				}
 				$albumsById[$albumId] = new AlbumInfo($albumId, $row['album_user'], $albumName, $row['location'], (int)$row['created'], (int)$row['last_added_photo']);
 			}

diff --git a/src/components/Albums/CollaboratorsSelectionForm.vue b/src/components/Albums/CollaboratorsSelectionForm.vue
@@ -51,7 +51,7 @@
 					<li v-for="collaboratorKey of searchResults" :key="collaboratorKey">
 						<NcListItemIcon :id="availableCollaborators[collaboratorKey].id"
 							class="manage-collaborators__form__list__result"
-							:title="availableCollaborators[collaboratorKey].id"
+							:title="availableCollaborators[collaboratorKey].label"
 							:search="searchText"
 							:user="availableCollaborators[collaboratorKey].id"
 							:display-name="availableCollaborators[collaboratorKey].label"
@@ -75,7 +75,7 @@
 				class="manage-collaborators__selection__item">
 				<NcListItemIcon :id="availableCollaborators[collaboratorKey].id"
 					:display-name="availableCollaborators[collaboratorKey].label"
-					:title="availableCollaborators[collaboratorKey].id"
+					:title="availableCollaborators[collaboratorKey].label"
 					:user="availableCollaborators[collaboratorKey].id">
 					<NcButton type="tertiary"
 						:aria-label="t('photos', 'Remove {collaboratorLabel} from the collaborators list', {collaboratorLabel: availableCollaborators[collaboratorKey].label})"