diff options
| author | Acid Chicken (硫酸鶏) <root@acid-chicken.com> | 2019-03-26 22:24:14 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-03-26 22:24:14 +0900 |
| commit | 8ce1d4d6a31779826796ac17781c51cfb5294e32 (patch) | |
| tree | f87690bcaec6257cf6f146e5986af4438fe76c6b /src/server/api/endpoints/drive | |
| parent | Fix drive file preview Fix #4532 (#4577) (diff) | |
| download | sharkey-8ce1d4d6a31779826796ac17781c51cfb5294e32.tar.gz sharkey-8ce1d4d6a31779826796ac17781c51cfb5294e32.tar.bz2 sharkey-8ce1d4d6a31779826796ac17781c51cfb5294e32.zip | |
Fix #4576 (#4579)
* Update update.ts
* Update api.ts
Diffstat (limited to 'src/server/api/endpoints/drive')
| -rw-r--r-- | src/server/api/endpoints/drive/folders/update.ts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/api/endpoints/drive/folders/update.ts b/src/server/api/endpoints/drive/folders/update.ts index 1dc0e63878..a1ee2669f0 100644 --- a/src/server/api/endpoints/drive/folders/update.ts +++ b/src/server/api/endpoints/drive/folders/update.ts @@ -83,7 +83,9 @@ export default define(meta, async (ps, user) => { if (ps.name) folder.name = ps.name; if (ps.parentId !== undefined) { - if (ps.parentId === null) { + if (ps.parentId.equals(folder._id)) { + throw new ApiError(meta.errors.recursiveNesting); + } else if (ps.parentId === null) { folder.parentId = null; } else { // Get parent folder |