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

Fix #1505 duration limit to combined boards

Browse source 
- 통합게시판 글을 모을 기간을 설정할 수 있도록 함
- 통합게시판 소속이 아니거나 기간을 벗어나는 글 발견시 실제 게시판 주소로 redirect
This commit is contained in:
Kijin Sung 2021-01-08 20:03:33 +09:00
parent 89240196c3
commit 88907fa9df
14 changed files with 53 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/document/document.model.php
View file

@ -1307,6 +1307,8 @@ class documentModel extends document
$args->page_count = $searchOpt->page_count ?? 10;
$args->start_date = $searchOpt->start_date ?? null;
$args->end_date = $searchOpt->end_date ?? null;
$args->start_regdate = $searchOpt->start_regdate ?? null;
$args->end_regdate = $searchOpt->end_regdate ?? null;
$args->s_is_notice = ($searchOpt->except_notice ?? false) ? 'N' : null;
$args->statusList = $searchOpt->statusList ?? array(self::getConfigStatus('public'), self::getConfigStatus('secret'));
$args->columnList = $searchOpt->columnList ?? array();

2
modules/document/queries/getDocumentCount.xml
View file

@ -35,6 +35,8 @@
<group pipe="and">
<condition operation="more" column="last_update" var="start_date" pipe="and" />
<condition operation="less" column="last_update" var="end_date" pipe="and" />
<condition operation="more" column="regdate" var="start_regdate" pipe="and" />
<condition operation="less" column="regdate" var="end_regdate" pipe="and" />
</group>
</conditions>
</query>

2
modules/document/queries/getDocumentCountByGroupStatus.xml
View file

@ -36,6 +36,8 @@
<group pipe="and">
<condition operation="more" column="last_update" var="start_date" pipe="and" />
<condition operation="less" column="last_update" var="end_date" pipe="and" />
<condition operation="more" column="regdate" var="start_regdate" pipe="and" />
<condition operation="less" column="regdate" var="end_regdate" pipe="and" />
</group>
</conditions>
<groups>

2
modules/document/queries/getDocumentList.xml
View file

@ -39,6 +39,8 @@
<group pipe="and">
<condition operation="more" column="last_update" var="start_date" pipe="and" />
<condition operation="less" column="last_update" var="end_date" pipe="and" />
<condition operation="more" column="regdate" var="start_regdate" pipe="and" />
<condition operation="less" column="regdate" var="end_regdate" pipe="and" />
</group>
</conditions>
<navigation>

2
modules/document/queries/getDocumentListExtraSort.xml
View file

@ -44,6 +44,8 @@
<group pipe="and">
<condition operation="more" column="d.last_update" var="start_date" pipe="and" />
<condition operation="less" column="d.last_update" var="end_date" pipe="and" />
<condition operation="more" column="d.regdate" var="start_regdate" pipe="and" />
<condition operation="less" column="d.regdate" var="end_regdate" pipe="and" />
</group>
</conditions>
<groups>

2
modules/document/queries/getDocumentListUseIndex.xml
View file

@ -42,6 +42,8 @@
<group pipe="and">
<condition operation="more" column="last_update" var="start_date" pipe="and" />
<condition operation="less" column="last_update" var="end_date" pipe="and" />
<condition operation="more" column="regdate" var="start_regdate" pipe="and" />
<condition operation="less" column="regdate" var="end_regdate" pipe="and" />
</group>
</conditions>
<navigation>

2
modules/document/queries/getDocumentListWithinComment.xml
View file

@ -20,6 +20,8 @@
<condition operation="below" column="documents.list_order" var="last_division" pipe="and" />
<condition operation="more" column="documents.last_update" var="start_date" pipe="and" />
<condition operation="less" column="documents.last_update" var="end_date" pipe="and" />
<condition operation="more" column="documents.regdate" var="start_regdate" pipe="and" />
<condition operation="less" column="documents.regdate" var="end_regdate" pipe="and" />
</conditions>
<groups>
<group column="documents.document_srl" />

2
modules/document/queries/getDocumentListWithinExtraVarsExtraSort.xml
View file

@ -45,6 +45,8 @@
<group pipe="and">
<condition operation="more" column="d.last_update" var="start_date" pipe="and" />
<condition operation="less" column="d.last_update" var="end_date" pipe="and" />
<condition operation="more" column="d.regdate" var="start_regdate" pipe="and" />
<condition operation="less" column="d.regdate" var="end_regdate" pipe="and" />
</group>
<group pipe="and">
<condition operation="equal" column="es.var_idx" var="var_idx" pipe="and" />

2
modules/document/queries/getDocumentListWithinTag.xml
View file

@ -19,6 +19,8 @@
<condition operation="below" column="documents.list_order" var="last_division" pipe="and" />
<condition operation="more" column="documents.last_update" var="start_date" pipe="and" />
<condition operation="less" column="documents.last_update" var="end_date" pipe="and" />
<condition operation="more" column="documents.regdate" var="start_regdate" pipe="and" />
<condition operation="less" column="documents.regdate" var="end_regdate" pipe="and" />
</conditions>
<groups>
<group column="documents.document_srl" />