From 07c2574c721df53819a3b71e7816e4a0548971d5 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sat, 4 May 2024 20:43:33 +0900 Subject: [PATCH] Fix #2321 return voted_count or blamed_count when vote is canceled --- modules/comment/comment.controller.php | 23 +++++++++++++++-------- modules/document/document.controller.php | 20 ++++++++++++++------ 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php index b9f74c6d1..0ef6518fb 100644 --- a/modules/comment/comment.controller.php +++ b/modules/comment/comment.controller.php @@ -130,10 +130,7 @@ class CommentController extends Comment { return $output; } - - $output = new BaseObject(); - $output->setMessage('success_voted_canceled'); - + $this->add('voted_count', $output->get('voted_count')); return $output; } @@ -257,10 +254,7 @@ class CommentController extends Comment { return $output; } - - $output = new BaseObject(); - $output->setMessage('success_blamed_canceled'); - + $this->add('blamed_count', $output->get('blamed_count')); return $output; } @@ -336,6 +330,19 @@ class CommentController extends Comment ModuleHandler::triggerCall('comment.updateVotedCountCancel', 'after', $trigger_obj); $oDB->commit(); + + // Return result + $output = new BaseObject(); + if($trigger_obj->update_target === 'voted_count') + { + $output->setMessage('success_voted_canceled'); + $output->add('voted_count', $trigger_obj->after_point); + } + else + { + $output->setMessage('success_blamed_canceled'); + $output->add('blamed_count', $trigger_obj->after_point); + } return $output; } diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 73019c943..792f852ac 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -141,9 +141,7 @@ class DocumentController extends Document { return $output; } - - $output = new BaseObject(); - $output->setMessage('success_voted_canceled'); + $this->add('voted_count', $output->get('voted_count')); return $output; } @@ -270,9 +268,7 @@ class DocumentController extends Document { return $output; } - - $output = new BaseObject(); - $output->setMessage('success_blamed_canceled'); + $this->add('blamed_count', $output->get('blamed_count')); return $output; } @@ -363,6 +359,18 @@ class DocumentController extends Document $oDB->commit(); + // Return result + $output = new BaseObject(); + if($trigger_obj->update_target === 'voted_count') + { + $output->setMessage('success_voted_canceled'); + $output->add('voted_count', $trigger_obj->after_point); + } + else + { + $output->setMessage('success_blamed_canceled'); + $output->add('blamed_count', $trigger_obj->after_point); + } return $output; }