mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-05-04 17:44:38 +09:00
Fix #1021 hide secret documents and comments from search
게시판에서 검색할 때 아래의 경우에는 비밀글을 제외 - 내용 - 제목+내용 - 댓글 댓글 검색시 비밀댓글도 제외
This commit is contained in:
parent
fad9400793
commit
7b8bea5923
3 changed files with 10 additions and 0 deletions
|
|
@ -1442,6 +1442,14 @@ class documentModel extends document
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Exclude secret documents if searching content or comment
|
||||||
|
// https://github.com/rhymix/rhymix/issues/1021
|
||||||
|
if($search_target === 'content' || $search_target === 'title_content' || $search_target === 'comment')
|
||||||
|
{
|
||||||
|
$args->statusList = array($this->getConfigStatus('public'));
|
||||||
|
$args->comment_is_secret = 'N';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($searchOpt->isExtraVars)
|
if ($searchOpt->isExtraVars)
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@
|
||||||
<condition operation="below" column="documents.list_order" var="last_division" pipe="and" />
|
<condition operation="below" column="documents.list_order" var="last_division" pipe="and" />
|
||||||
</group>
|
</group>
|
||||||
<condition operation="like" column="comments.content" var="s_comment" notnull="notnull" pipe="and" />
|
<condition operation="like" column="comments.content" var="s_comment" notnull="notnull" pipe="and" />
|
||||||
|
<condition operation="equal" column="comments.is_secret" var="comment_is_secret" pipe="and" />
|
||||||
</conditions>
|
</conditions>
|
||||||
<navigation>
|
<navigation>
|
||||||
<index var="sort_index" default="comments.list_order" order="asc" />
|
<index var="sort_index" default="comments.list_order" order="asc" />
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@
|
||||||
<condition operation="below" column="documents.list_order" var="last_division" pipe="and" />
|
<condition operation="below" column="documents.list_order" var="last_division" pipe="and" />
|
||||||
</group>
|
</group>
|
||||||
<condition operation="like" column="comments.content" var="s_comment" notnull="notnull" pipe="and" />
|
<condition operation="like" column="comments.content" var="s_comment" notnull="notnull" pipe="and" />
|
||||||
|
<condition operation="equal" column="comments.is_secret" var="comment_is_secret" pipe="and" />
|
||||||
<group pipe="and">
|
<group pipe="and">
|
||||||
<condition operation="less" column="documents.list_order" var="list_order" filter="number" pipe="and" />
|
<condition operation="less" column="documents.list_order" var="list_order" filter="number" pipe="and" />
|
||||||
<condition operation="more" column="documents.list_order" var="rev_list_order" filter="number" pipe="and" />
|
<condition operation="more" column="documents.list_order" var="rev_list_order" filter="number" pipe="and" />
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue