github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-17 11:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 优化重复共享提示

Browse Source
This commit is contained in:
kuaifan 2022-04-21 16:31:28 +08:00
parent 6b2b072e16
commit a48a1210c8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Api/FileController.php
View File

@ -845,8 +845,10 @@ class FileController extends AbstractController
return Base::retError('仅限所有者操作'); return Base::retError('仅限所有者操作');
} }
// //
if ($file->isNnShare()) { $share = $file->isNnShare();
return Base::retError('已经处于共享文件夹中'); if ($share) {
$typeCn = $file->type === 'folder' ? '文件夹' : '文件';
return Base::retError("此{$typeCn}已经处于【{$share->name}】共享文件夹中，无法重复共享");
} }
// //
if (!is_array($userids) || empty($userids)) { if (!is_array($userids) || empty($userids)) {

4
app/Models/File.php
View File

@ -142,7 +142,7 @@ class File extends AbstractModel
/** /**
* 是否处于共享文件夹内（不含自身） * 是否处于共享文件夹内（不含自身）
* @return bool * @return File|false
*/ */
public function isNnShare() public function isNnShare()
{ {
@ -153,7 +153,7 @@ class File extends AbstractModel
break; break;
} }
if ($row->share) { if ($row->share) {
return true; return $row;
} }
$pid = $row->pid; $pid = $row->pid;
} }