Fix displaying of file details button for local syncfileitem activities
authorClaudio Cambra <claudio.cambra@nextcloud.com>
Tue, 31 Jan 2023 12:03:52 +0000 (13:03 +0100)
committerbackportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com>
Tue, 31 Jan 2023 14:10:04 +0000 (14:10 +0000)
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
src/gui/tray/activitylistmodel.cpp
src/gui/tray/usermodel.cpp

index e41b88b035feba890b02201de68654a68b2a84ff..6b6b4569cc8b47063659f61111b4736bb251b25b 100644 (file)
@@ -341,11 +341,11 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
     case DisplayActions:
         return _displayActions;
     case ShowFileDetailsRole:
-        return !data(index, PathRole).toString().isEmpty() &&
+        return _displayActions &&
                 a._objectType == QStringLiteral("files") &&
-                _displayActions &&
                 a._fileAction != "file_deleted" &&
-                a._syncFileItemStatus != SyncFileItem::FileIgnored;
+                a._syncFileItemStatus != SyncFileItem::FileIgnored &&
+                !data(index, OpenablePathRole).toString().isEmpty();
     case DismissableRole:
         // Do not allow dismissal of things requiring user input regarding syncing
         return !a._links.isEmpty() &&
index cc702e114d07bce4ebd737ff4f24b9e61e6915dd..a26a054cd001ede34f74a8e78e5f734d6f623639 100644 (file)
@@ -658,6 +658,7 @@ void User::processCompletedSyncItem(const Folder *folder, const SyncFileItemPtr
 
     Activity activity;
     activity._type = Activity::SyncFileItemType; //client activity
+    activity._objectType = QStringLiteral("files");
     activity._syncFileItemStatus = item->_status;
     activity._dateTime = QDateTime::currentDateTime();
     activity._message = item->_originalFile;