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

Fix #962 hide deleted comment from integration search

Browse source
This commit is contained in:
Kijin Sung 2018-01-12 19:40:09 +09:00
parent a8f2bc9bd4
commit 09f22aa42e
4 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/comment/comment.model.php
View file

@ -700,6 +700,7 @@ class commentModel extends comment
$args->page_count = $obj->page_count ? $obj->page_count : 10; $args->page_count = $obj->page_count ? $obj->page_count : 10;
$args->s_module_srl = $obj->module_srl; $args->s_module_srl = $obj->module_srl;
$args->exclude_module_srl = $obj->exclude_module_srl; $args->exclude_module_srl = $obj->exclude_module_srl;
$args->statusList = $obj->statusList;
if ($obj->is_secret) if ($obj->is_secret)
{ {
$args->s_is_secret = $obj->is_secret; $args->s_is_secret = $obj->is_secret;

1
modules/comment/queries/getTotalCommentList.xml
View file

@ -10,6 +10,7 @@
<condition operation="notin" column="module_srl" var="exclude_module_srl" pipe="and" /> <condition operation="notin" column="module_srl" var="exclude_module_srl" pipe="and" />
<condition operation="equal" column="is_secret" var="s_is_secret" pipe="and" /> <condition operation="equal" column="is_secret" var="s_is_secret" pipe="and" />
<condition operation="equal" column="status" var="s_is_published" pipe="and" /> <condition operation="equal" column="status" var="s_is_published" pipe="and" />
<condition operation="in" column="status" var="statusList" pipe="and" />
<group pipe="and"> <group pipe="and">
<condition operation="like" column="content" var="s_content" pipe="or" /> <condition operation="like" column="content" var="s_content" pipe="or" />
<condition operation="equal" column="user_name" var="s_user_name" pipe="or" /> <condition operation="equal" column="user_name" var="s_user_name" pipe="or" />

2
modules/comment/queries/getTotalCommentListWithinMember.xml
View file

@ -10,6 +10,8 @@
<condition operation="equal" column="member.user_id" var="s_user_id" notnull="notnull" /> <condition operation="equal" column="member.user_id" var="s_user_id" notnull="notnull" />
<condition operation="equal" column="member.member_srl" var="comments.member_srl" notnull="notnull" pipe="and" /> <condition operation="equal" column="member.member_srl" var="comments.member_srl" notnull="notnull" pipe="and" />
<condition operation="equal" column="comments.is_secret" var="s_is_secret" pipe="and" /> <condition operation="equal" column="comments.is_secret" var="s_is_secret" pipe="and" />
<condition operation="equal" column="comments.status" var="s_is_published" pipe="and" />
<condition operation="in" column="comments.status" var="statusList" pipe="and" />
<group pipe="and"> <group pipe="and">
<condition operation="like" column="comments.content" var="s_content" /> <condition operation="like" column="comments.content" var="s_content" />
<condition operation="equal" column="comments.user_name" var="s_user_name" pipe="or" /> <condition operation="equal" column="comments.user_name" var="s_user_name" pipe="or" />

1
modules/integration_search/integration_search.model.php
View file

@ -104,6 +104,7 @@ class integration_searchModel extends module
$args->is_secret = 'N'; $args->is_secret = 'N';
$args->sort_index = 'list_order'; $args->sort_index = 'list_order';
$args->order_type = 'asc'; $args->order_type = 'asc';
$args->statusList = array(1);
// Get a list of documents // Get a list of documents
$oCommentModel = getModel('comment'); $oCommentModel = getModel('comment');
$output = $oCommentModel->getTotalCommentList($args); $output = $oCommentModel->getTotalCommentList($args);