diff --git a/controllers/file.go b/controllers/file.go index 3254eba..07c8fea 100644 --- a/controllers/file.go +++ b/controllers/file.go @@ -67,7 +67,7 @@ func (c *ApiController) AddFile() { defer file.Close() } - res, bs, err := object.AddFile(storeId, key, isLeaf, filename, file) + res, bs, err := object.AddFile(storeId, userName, key, isLeaf, filename, file) if err != nil { c.ResponseError(err.Error()) return diff --git a/object/file.go b/object/file.go index 85c4330..f82ea13 100644 --- a/object/file.go +++ b/object/file.go @@ -28,7 +28,7 @@ func UpdateFile(storeId string, key string, file *File) bool { return true } -func AddFile(storeId string, key string, isLeaf bool, filename string, file multipart.File) (bool, []byte, error) { +func AddFile(storeId string, userName string, key string, isLeaf bool, filename string, file multipart.File) (bool, []byte, error) { store, err := GetStore(storeId) if err != nil { return false, nil, err @@ -49,7 +49,7 @@ func AddFile(storeId string, key string, isLeaf bool, filename string, file mult } bs := fileBuffer.Bytes() - err = storage.PutObject(store.StorageProvider, objectKey, fileBuffer) + err = storage.PutObject(store.StorageProvider, userName, store.Name, objectKey, fileBuffer) if err != nil { return false, nil, err } @@ -60,7 +60,7 @@ func AddFile(storeId string, key string, isLeaf bool, filename string, file mult objectKey = strings.TrimLeft(objectKey, "/") fileBuffer = bytes.NewBuffer(nil) bs := fileBuffer.Bytes() - err = storage.PutObject(store.StorageProvider, objectKey, fileBuffer) + err = storage.PutObject(store.StorageProvider, userName, store.Name, objectKey, fileBuffer) if err != nil { return false, nil, err } diff --git a/storage/storage.go b/storage/storage.go index 6ae25ae..9edd7dd 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -63,8 +63,8 @@ func GetObject(provider string, key string) (io.ReadCloser, error) { return response.Body, nil } -func PutObject(provider string, key string, fileBuffer *bytes.Buffer) error { - _, _, err := casdoorsdk.UploadResource("Casibase", "", "", fmt.Sprintf("Direct/%s/%s", provider, key), fileBuffer.Bytes()) +func PutObject(provider string, user string, parent string, key string, fileBuffer *bytes.Buffer) error { + _, _, err := casdoorsdk.UploadResource(user, "Casibase", parent, fmt.Sprintf("Direct/%s/%s", provider, key), fileBuffer.Bytes()) if err != nil { return err } diff --git a/web/src/App.js b/web/src/App.js index a0a8b9b..824f103 100644 --- a/web/src/App.js +++ b/web/src/App.js @@ -317,19 +317,26 @@ class App extends Component { ); }; + res.push(Setting.getItem( + + {i18next.t("general:Resources")} + {renderExternalLink()} + , + "#")); + res.push(Setting.getItem( {i18next.t("general:Permissions")} {renderExternalLink()} , - "/permissions")); + "##")); res.push(Setting.getItem( {i18next.t("general:Logs")} {renderExternalLink()} , - "/logs")); + "###")); } return res;