comments working
This commit is contained in:
parent
375bed1d01
commit
0b472988a2
14 changed files with 107 additions and 59 deletions
|
|
@ -21,7 +21,6 @@ return [
|
|||
"location" => [
|
||||
"page" => $page,
|
||||
"project" => $project,
|
||||
"dialogUri" => $data->dialogUri,
|
||||
"file" => $file
|
||||
],
|
||||
"position" => [
|
||||
|
|
|
|||
|
|
@ -8,12 +8,11 @@ return [
|
|||
$data = json_decode($json);
|
||||
|
||||
$page = page($data->location->page->uri);
|
||||
$project = page($data->location->project->uri);
|
||||
|
||||
$file = $page->file($data->location->file->uuid);
|
||||
$isReply = $data->location->parent->id ?? false;
|
||||
|
||||
$comments = $file->comments()->isEmpty() == true ? [] : Yaml::decode($file->comments()->value());
|
||||
|
||||
$isReply = $data->location->parent->id ?? false;
|
||||
foreach ($comments as $key => &$comment) {
|
||||
if ($isReply) {
|
||||
if ($comment['id'] === $data->location->parent->id) {
|
||||
|
|
@ -39,6 +38,7 @@ return [
|
|||
|
||||
echo json_encode(getFileData($newFile));
|
||||
|
||||
$project = $page->parents()->findBy("template", "project");
|
||||
$project->deleteNotification($data->id);
|
||||
|
||||
exit;
|
||||
|
|
|
|||
|
|
@ -10,10 +10,8 @@ return [
|
|||
$data = json_decode($json);
|
||||
|
||||
$page = page($data->fileParentUri);
|
||||
$project = $page->parent()->template() == "project" ? $page->parent() : $page->parent()->parent();
|
||||
|
||||
$file = $page->file($data->fileName);
|
||||
$user = kirby()->user($data->userUuid);
|
||||
|
||||
$comments = $file->comments()->isEmpty() == true ? [] : Yaml::decode($file->comments()->value());
|
||||
|
||||
foreach ($comments as &$comment) {
|
||||
|
|
@ -22,8 +20,6 @@ return [
|
|||
$replyData = [
|
||||
"location" => [
|
||||
"page" => $page,
|
||||
"project" => $project,
|
||||
"dialogUri" => $data->dialogUri,
|
||||
"file" => $file,
|
||||
"parent" => $comment
|
||||
],
|
||||
|
|
@ -45,7 +41,8 @@ return [
|
|||
'comments' => $comments
|
||||
]);
|
||||
|
||||
$user->sendNotification($project, $replyData);
|
||||
$project = $page->parents()->findBy("template", "project");
|
||||
$project->createNotification($replyData);
|
||||
|
||||
return getFileData($newFile);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue