mirror of
https://github.com/halejohn/Cloudreve.git
synced 2026-01-26 09:34:57 +08:00
Feat: get policy from directory props / Feat: return source enabled flag in file list
This commit is contained in:
@@ -54,9 +54,7 @@ func (service *ListFolderService) List(c *gin.Context) serializer.Response {
|
||||
}
|
||||
|
||||
return serializer.Response{
|
||||
Data: map[string]interface{}{
|
||||
"objects": res,
|
||||
},
|
||||
Data: serializer.BuildObjectList(0, res, nil),
|
||||
}
|
||||
|
||||
}
|
||||
@@ -82,9 +80,7 @@ func (service *ListFolderService) List(c *gin.Context) serializer.Response {
|
||||
}
|
||||
|
||||
return serializer.Response{
|
||||
Data: map[string]interface{}{
|
||||
"objects": res,
|
||||
},
|
||||
Data: serializer.BuildObjectList(0, res, nil),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@ import (
|
||||
"context"
|
||||
|
||||
"github.com/cloudreve/Cloudreve/v3/pkg/filesystem"
|
||||
"github.com/cloudreve/Cloudreve/v3/pkg/hashid"
|
||||
"github.com/cloudreve/Cloudreve/v3/pkg/serializer"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
@@ -40,10 +39,7 @@ func (service *DirectoryService) ListDirectory(c *gin.Context) serializer.Respon
|
||||
|
||||
return serializer.Response{
|
||||
Code: 0,
|
||||
Data: map[string]interface{}{
|
||||
"parent": hashid.HashID(parentID, hashid.FolderID),
|
||||
"objects": objects,
|
||||
},
|
||||
Data: serializer.BuildObjectList(parentID, objects, fs.Policy),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -25,13 +25,6 @@ func (service *UploadCredentialService) Get(ctx context.Context, c *gin.Context)
|
||||
return serializer.Err(serializer.CodePolicyNotAllowed, err.Error(), err)
|
||||
}
|
||||
|
||||
// 存储策略是否一致
|
||||
if service.Type != "" {
|
||||
if service.Type != fs.User.Policy.Type {
|
||||
return serializer.Err(serializer.CodePolicyNotAllowed, "存储策略已变更,请刷新页面", nil)
|
||||
}
|
||||
}
|
||||
|
||||
ctx = context.WithValue(ctx, fsctx.GinCtx, c)
|
||||
credential, err := fs.GetUploadToken(ctx, service.Path, service.Size, service.Name)
|
||||
if err != nil {
|
||||
|
||||
@@ -263,10 +263,7 @@ func (service *Service) List(c *gin.Context) serializer.Response {
|
||||
|
||||
return serializer.Response{
|
||||
Code: 0,
|
||||
Data: map[string]interface{}{
|
||||
"parent": "0000",
|
||||
"objects": objects,
|
||||
},
|
||||
Data: serializer.BuildObjectList(0, objects, nil),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user