sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix link activity message

Browse Source
This commit is contained in:
Roman Perekhod
2024-11-26 17:25:21 +01:00
parent 6c3684a02c
commit 187c8f3133
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelog/unreleased/fix-link-activity.md
+6
View File
@@ -0,0 +1,6 @@
Bugfix: Fix link activity message
We changed the link token to display name in the activity message.
https://github.com/owncloud/ocis/pull/10663
https://github.com/owncloud/ocis/issues/10295
services/activitylog/pkg/service/http.go
+1 -1
View File
@@ -204,7 +204,7 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h
WithVar("resource", storagespace.FormatResourceID(ev.ItemID), ev.ResourceName), WithVar("resource", storagespace.FormatResourceID(ev.ItemID), ev.ResourceName),
WithUser(ev.Executant, nil, nil), WithUser(ev.Executant, nil, nil),
WithTranslation(&t, loc, "field", []string{ev.FieldUpdated}), WithTranslation(&t, loc, "field", []string{ev.FieldUpdated}),
WithVar("token", ev.ItemID.GetOpaqueId(), ev.Token)) WithVar("token", ev.ItemID.GetOpaqueId(), ev.DisplayName))
case events.LinkRemoved: case events.LinkRemoved:
message = MessageLinkDeleted message = MessageLinkDeleted
ts = utils.TSToTime(ev.Timestamp) ts = utils.TSToTime(ev.Timestamp)
tests/acceptance/features/apiActivities/shareActivities.feature
+6 -12
View File
@@ -1161,8 +1161,7 @@ Feature: check share activity
"pattern": "%user_id_pattern%" "pattern": "%user_id_pattern%"
}, },
"name": { "name": {
"type": "string", "type": "string"
"pattern": "[a-zA-z]{15}"
} }
} }
}, },
@@ -1235,8 +1234,7 @@ Feature: check share activity
"pattern": "%user_id_pattern%" "pattern": "%user_id_pattern%"
}, },
"name": { "name": {
"type": "string", "type": "string"
"pattern": "[a-zA-z]{15}"
} }
} }
}, },
@@ -1309,8 +1307,7 @@ Feature: check share activity
"pattern": "%user_id_pattern%" "pattern": "%user_id_pattern%"
}, },
"name": { "name": {
"type": "string", "type": "string"
"pattern": "[a-zA-z]{15}"
} }
} }
}, },
@@ -1473,8 +1470,7 @@ Feature: check share activity
"pattern": "%user_id_pattern%" "pattern": "%user_id_pattern%"
}, },
"name": { "name": {
"type": "string", "type": "string"
"pattern": "[a-zA-z]{15}"
} }
} }
}, },
@@ -1547,8 +1543,7 @@ Feature: check share activity
"pattern": "%user_id_pattern%" "pattern": "%user_id_pattern%"
}, },
"name": { "name": {
"type": "string", "type": "string"
"pattern": "[a-zA-z]{15}"
} }
} }
}, },
@@ -1621,8 +1616,7 @@ Feature: check share activity
"pattern": "%user_id_pattern%" "pattern": "%user_id_pattern%"
}, },
"name": { "name": {
"type": "string", "type": "string"
"pattern": "[a-zA-z]{15}"
} }
} }
}, },