mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-07 04:40:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10663 from 2403905/issue-10295

Browse Source 
Fix link activity message
This commit is contained in:
Roman Perekhod
2024-12-10 09:38:03 +01:00
committed by GitHub
parent e15dac85e9 187c8f3133
commit 0cc51c4cff
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
changelog/unreleased/fix-link-activity.md Normal file
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

2
services/activitylog/pkg/service/http.go
View File

@@ -204,7 +204,7 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h
WithVar("resource", storagespace.FormatResourceID(ev.ItemID), ev.ResourceName),
WithUser(ev.Executant, nil, nil),
WithTranslation(&t, loc, "field", []string{ev.FieldUpdated}),
WithVar("token", ev.ItemID.GetOpaqueId(), ev.Token))
WithVar("token", ev.ItemID.GetOpaqueId(), ev.DisplayName))
case events.LinkRemoved:
message = MessageLinkDeleted
ts = utils.TSToTime(ev.Timestamp)

18
tests/acceptance/features/apiActivities/shareActivities.feature
View File

@@ -1161,8 +1161,7 @@ Feature: check share activity
"pattern": "%user_id_pattern%"
},
"name": {
"type": "string",
"pattern": "[a-zA-z]{15}"
"type": "string"
}
}
},
@@ -1235,8 +1234,7 @@ Feature: check share activity
"pattern": "%user_id_pattern%"
},
"name": {
"type": "string",
"pattern": "[a-zA-z]{15}"
"type": "string"
}
}
},
@@ -1309,8 +1307,7 @@ Feature: check share activity
"pattern": "%user_id_pattern%"
},
"name": {
"type": "string",
"pattern": "[a-zA-z]{15}"
"type": "string"
}
}
},
@@ -1660,8 +1657,7 @@ Feature: check share activity
"pattern": "%user_id_pattern%"
},
"name": {
"type": "string",
"pattern": "[a-zA-z]{15}"
"type": "string"
}
}
},
@@ -1734,8 +1730,7 @@ Feature: check share activity
"pattern": "%user_id_pattern%"
},
"name": {
"type": "string",
"pattern": "[a-zA-z]{15}"
"type": "string"
}
}
},
@@ -1808,8 +1803,7 @@ Feature: check share activity
"pattern": "%user_id_pattern%"
},
"name": {
"type": "string",
"pattern": "[a-zA-z]{15}"
"type": "string"
}
}
},