fix(activitylog): space -> folder

Signed-off-by: jkoberg <jkoberg@owncloud.com>
This commit is contained in:
jkoberg
2024-09-18 10:07:22 +02:00
committed by Christian Richter
parent 79c4ce3abf
commit 7bafe7f66e
3 changed files with 4 additions and 13 deletions

View File

@@ -191,7 +191,7 @@ config = {
},
"e2eTests": {
"part": {
"skip": True, # TODO: reenable them as soon as the test is fixed in web
"skip": True, # TODO: reenable them as soon as the test is fixed in web
"totalParts": 4, # divide and run all suites in parts (divide pipelines)
"xsuites": ["search", "app-provider", "oidc"], # suites to skip
},

View File

@@ -22,8 +22,8 @@ import (
// Translations
var (
MessageResourceCreated = l10n.Template("{user} added {resource} to {folder}")
MessageResourceUpdated = l10n.Template("{user} updated {resource} in {folder}")
MessageResourceTrashed = l10n.Template("{user} deleted {resource} from {folder}")
MessageResourceUpdated = l10n.Template("{user} updated {resource} in {space}")
MessageResourceMoved = l10n.Template("{user} moved {resource} to {folder}")
MessageResourceRenamed = l10n.Template("{user} renamed {oldResource} to {resource}")
MessageShareCreated = l10n.Template("{user} shared {resource} with {sharee}")
@@ -71,16 +71,6 @@ func WithResource(ref *provider.Reference, addSpace bool) ActivityOption {
Name: info.GetName(),
}
parent, err := utils.GetResourceByID(ctx, info.GetParentId(), gwc)
if err != nil {
return err
}
vars["folder"] = Resource{
ID: info.GetParentId().GetOpaqueId(),
Name: parent.GetName(),
}
if addSpace {
vars["space"] = Resource{
ID: info.GetSpace().GetId().GetOpaqueId(),
@@ -228,6 +218,7 @@ func WithSpace(spaceid *provider.StorageSpaceId) ActivityOption {
}
}
// WithLinkFieldUpdated sets the field and token variables for an activity
func WithLinkFieldUpdated(e *events.LinkUpdated) ActivityOption {
return func(_ context.Context, _ gateway.GatewayAPIClient, vars map[string]interface{}) error {
f := "some field"

View File

@@ -678,7 +678,7 @@ Feature: check share activity
"required": ["message","variables"],
"properties": {
"message": {
"const": "{user} updated {resource} in {space}"
"const": "{user} updated {resource} in {folder}"
},
"variables": {
"type": "object",