YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: handle legacy workspace setting

Browse Source
This commit is contained in:
steven
2024-05-07 22:07:44 +08:00
parent a73f979f96
commit e16546f80a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/router/api/v1/memo_resource_service.go
View File

@@ -73,7 +73,7 @@ func (s *APIV1Service) ListMemoResources(ctx context.Context, request *v1pb.List
MemoID: &id, MemoID: &id,
}) })
if err != nil { if err != nil {
return nil, status.Errorf(codes.Internal, "failed to list resources") return nil, status.Errorf(codes.Internal, "failed to list resources: %v", err)
} }
response := &v1pb.ListMemoResourcesResponse{ response := &v1pb.ListMemoResourcesResponse{

6
store/workspace_setting.go
View File

@@ -69,6 +69,9 @@ func (s *Store) ListWorkspaceSettings(ctx context.Context, find *FindWorkspaceSe
if err != nil { if err != nil {
return nil, errors.Wrap(err, "Failed to convert workspace setting") return nil, errors.Wrap(err, "Failed to convert workspace setting")
} }
if workspaceSetting == nil {
continue
}
s.workspaceSettingCache.Store(workspaceSetting.Key.String(), workspaceSetting) s.workspaceSettingCache.Store(workspaceSetting.Key.String(), workspaceSetting)
workspaceSettings = append(workspaceSettings, workspaceSetting) workspaceSettings = append(workspaceSettings, workspaceSetting)
} }
@@ -206,7 +209,8 @@ func convertWorkspaceSettingFromRaw(workspaceSettingRaw *WorkspaceSetting) (*sto
} }
workspaceSetting.Value = &storepb.WorkspaceSetting_MemoRelatedSetting{MemoRelatedSetting: memoRelatedSetting} workspaceSetting.Value = &storepb.WorkspaceSetting_MemoRelatedSetting{MemoRelatedSetting: memoRelatedSetting}
default: default:
return nil, errors.Errorf("unsupported workspace setting key: %v", workspaceSettingRaw.Name) // Skip unsupported workspace setting key.
return nil, nil
} }
return workspaceSetting, nil return workspaceSetting, nil
} }