fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 10:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1285 #1286 prevent change of status of deleted comments

Browse source
This commit is contained in:
Kijin Sung 2020-05-17 21:14:59 +09:00
parent b36675aeba
commit b5fc7b9ab2
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/comment/comment.admin.controller.php
View file

@ -69,6 +69,14 @@ class commentAdminController extends comment
$args = new stdClass(); $args = new stdClass();
$args->status = $will_publish; $args->status = $will_publish;
if ($will_publish)
{
$args->old_status = array(0, 1, 2, 3, 4, 5, 6);
}
else
{
$args->old_status = array(0, 1);
}
$args->comment_srls_list = $comment_srl_list; $args->comment_srls_list = $comment_srl_list;
$output = executeQuery('comment.updatePublishedStatus', $args); $output = executeQuery('comment.updatePublishedStatus', $args);
if(!$output->toBool()) if(!$output->toBool())
@ -89,15 +97,16 @@ class commentAdminController extends comment
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
//$oMemberModule = getModel("member"); //$oMemberModule = getModel("member");
//$logged_info = $oMemberModule->getMemberInfoByMemberSrl($logged_member_srl); //$logged_info = $oMemberModule->getMemberInfoByMemberSrl($logged_member_srl);
$new_status = ($will_publish) ? "published" : "unpublished"; $new_status = lang('comment.published_name_list')[$will_publish];
foreach($comment_srl_list as $comment_srl) foreach($comment_srl_list as $comment_srl)
{ {
// check if comment already exists // check if comment already exists
$comment = $oCommentModel->getComment($comment_srl); $comment = $oCommentModel->getComment($comment_srl);
if($comment->comment_srl != $comment_srl) if($comment->comment_srl != $comment_srl || $comment->status != $will_publish)
{ {
throw new Rhymix\Framework\Exceptions\InvalidRequest; continue;
} }
$document_srl = $comment->document_srl; $document_srl = $comment->document_srl;
if(!in_array($document_srl, $updated_documents_arr)) if(!in_array($document_srl, $updated_documents_arr))
{ {

7
modules/comment/queries/updatePublishedStatus.xml
View file

@ -6,7 +6,10 @@
<column name="status" var="status" notnull="notnull" /> <column name="status" var="status" notnull="notnull" />
</columns> </columns>
<conditions> <conditions>
<condition operation="in" column="comment_srl" var="comment_srls_list" notnull="notnull" pipe="or" /> <condition operation="in" column="status" var="old_status" />
<condition operation="in" column="parent_srl" var="comment_srls_list" notnull="notnull" pipe="or" /> <group pipe="and">
<condition operation="in" column="comment_srl" var="comment_srls_list" notnull="notnull" />
<condition operation="in" column="parent_srl" var="comment_srls_list" notnull="notnull" pipe="or" />
</group>
</conditions> </conditions>
</query> </query>