Browse Source

Add user, parent and tag

HEAD
Yang Luo 2 years ago
parent
commit
960f08188f
4 changed files with 15 additions and 8 deletions
  1. +1
    -1
      controllers/file.go
  2. +3
    -3
      object/file.go
  3. +2
    -2
      storage/storage.go
  4. +9
    -2
      web/src/App.js

+ 1
- 1
controllers/file.go View File

@@ -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


+ 3
- 3
object/file.go View File

@@ -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
}


+ 2
- 2
storage/storage.go View File

@@ -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
}


+ 9
- 2
web/src/App.js View File

@@ -317,19 +317,26 @@ class App extends Component {
);
};

res.push(Setting.getItem(
<a target="_blank" rel="noreferrer" href={Setting.getMyProfileUrl(this.state.account).replace("/account", "/resources")}>
{i18next.t("general:Resources")}
{renderExternalLink()}
</a>,
"#"));

res.push(Setting.getItem(
<a target="_blank" rel="noreferrer" href={Setting.getMyProfileUrl(this.state.account).replace("/account", "/permissions")}>
{i18next.t("general:Permissions")}
{renderExternalLink()}
</a>,
"/permissions"));
"##"));

res.push(Setting.getItem(
<a target="_blank" rel="noreferrer" href={Setting.getMyProfileUrl(this.state.account).replace("/account", "/records")}>
{i18next.t("general:Logs")}
{renderExternalLink()}
</a>,
"/logs"));
"###"));
}

return res;


Loading…
Cancel
Save