Skip to content

[stable30] fix(Album): Do not overwrite album on rename #3302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artonge merged 4 commits into from
Nov 13, 2025
Merged

[stable30] fix(Album): Do not overwrite album on rename #3302

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
358f8a0
Revert "fix(albums): Do not overwrite albums on move"
artonge Nov 13, 2025
f5cc512
fix(Album): [stable31] Do not overwrite album on rename
artonge Nov 13, 2025
2eaf507
chore(assets): Recompile assets
nextcloud-command Nov 13, 2025
a39d167
chore(assets): Recompile assets
nextcloud-command Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(Album): [stable31] Do not overwrite album on rename 
Signed-off-by: Louis Chmn <[email protected]>
  • Loading branch information
@artonge @backportbot
artonge authored and backportbot[bot] committed Nov 13, 2025
commit f5cc512174e763b4d2e93adafa02973f5a66d75d
9 changes: 9 additions & 0 deletions src/store/collections.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,15 @@ const actions = {
filename: collection.filename.replace(new RegExp(`${collection.basename}$`), newBaseName),
}

try {
await client.stat(newCollection.filename)
logger.error(t('photos', 'Failed to rename {currentCollectionFileName} to {newCollectionFileName}', { currentCollectionFileName: collectionFileName, newCollectionFileName: newCollection.filename }), { error: new Error('Target collection already exists') })
showError(t('photos', 'Failed to rename {currentCollectionFileName} to {newCollectionFileName}', { currentCollectionFileName: collectionFileName, newCollectionFileName: newCollection.filename }))
return collection
} catch (error) {
// If the stat fails, it means that the target does not exist yet, so all good.
}

try {
context.commit('addCollections', { collections: [newCollection] })
context.commit('setCollectionFiles', { collectionFileName: newCollection.filename, fileIds: context.state.collectionsFiles[collectionFileName] })
Expand Down