mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clicking on file name clash activities now opens file in web UI were the clash can be resolved

Browse Source 
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
This commit is contained in:
Claudio Cambra 2022-09-21 19:15:35 +02:00
parent 6fa2542a10
commit 664a80cbb5
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/tray/activitylistmodel.cpp
View File

@ -811,6 +811,22 @@ void ActivityListModel::slotTriggerDefaultAction(const int activityIndex)
_currentInvalidFilenameDialog->open();
ownCloudGui::raiseDialog(_currentInvalidFilenameDialog);
return;
} else if (activity._status == SyncFileItem::FileNameClash) {
const auto folder = FolderMan::instance()->folder(activity._folder);
const auto relPath = activity._fileAction == QStringLiteral("file_renamed") ? activity._renamedFile : activity._file;
SyncJournalFileRecord record;
if (!folder || !folder->journalDb()->getFileRecord(relPath, &record)) {
return;
}
fetchPrivateLinkUrl(folder->accountState()->account(),
relPath,
record.numericFileId(),
this,
[](const QString &link) { Utility::openBrowser(link); }
);
return;
}
if (!path.isEmpty()) {