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 #847 separate getFileList query from getFileListByTargetStatus

Browse source
This commit is contained in:
Kijin Sung 2017-06-09 22:24:21 +09:00
parent 15bba27967
commit 3462778803
3 changed files with 57 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/file/file.admin.model.php
View file

@ -84,14 +84,12 @@ class fileAdminModel extends file
{ {
$args->document_status = array('PUBLIC'); $args->document_status = array('PUBLIC');
$args->comment_is_secret = array('N'); $args->comment_is_secret = array('N');
$output = executeQuery('file.getFileListByTargetStatus', $args, $columnList);
} }
else else
{ {
$args->document_status = array('PUBLIC', 'PRIVATE', 'SECRET', 'TEMP'); $output = executeQuery('file.getFileList', $args, $columnList);
$args->comment_is_secret = array('Y', 'N');
} }
// Execute the file.getFileList query
$output = executeQuery('file.getFileList', $args, $columnList);
// Return if no result or an error occurs // Return if no result or an error occurs
if(!$output->toBool()||!count($output->data)) return $output; if(!$output->toBool()||!count($output->data)) return $output;

18
modules/file/queries/getFileList.xml
View file

@ -6,16 +6,6 @@
<condition operation="equal" column="files.member_srl" default="member.member_srl" /> <condition operation="equal" column="files.member_srl" default="member.member_srl" />
</conditions> </conditions>
</table> </table>
<table name="documents" type="left join">
<conditions>
<condition operation="equal" column="files.upload_target_srl" default="documents.document_srl" />
</conditions>
</table>
<table name="comments" type="left join">
<conditions>
<condition operation="equal" column="files.upload_target_srl" default="comments.comment_srl" />
</conditions>
</table>
</tables> </tables>
<columns> <columns>
<column name="files.*" /> <column name="files.*" />
@ -26,14 +16,6 @@
<condition operation="equal" column="files.isvalid" var="isvalid" pipe="and" /> <condition operation="equal" column="files.isvalid" var="isvalid" pipe="and" />
<condition operation="equal" column="files.direct_download" var="direct_download" pipe="and" /> <condition operation="equal" column="files.direct_download" var="direct_download" pipe="and" />
<condition operation="below" column="files.regdate" var="regdate_before" pipe="and" /> <condition operation="below" column="files.regdate" var="regdate_before" pipe="and" />
<group pipe="and">
<condition operation="in" column="documents.status" var="document_status" />
<condition operation="null" column="documents.status" pipe="or" />
</group>
<group pipe="and">
<condition operation="in" column="comments.is_secret" var="comment_is_secret" />
<condition operation="null" column="comments.is_secret" pipe="or" />
</group>
<group pipe="and"> <group pipe="and">
<condition operation="like" column="files.source_filename" var="s_filename" pipe="or" /> <condition operation="like" column="files.source_filename" var="s_filename" pipe="or" />
<condition operation="more" column="files.file_size" var="s_filesize_more" pipe="or" /> <condition operation="more" column="files.file_size" var="s_filesize_more" pipe="or" />

55
modules/file/queries/getFileListByTargetStatus.xml Normal file
View file

@ -0,0 +1,55 @@
<query id="getFileList" action="select">
<tables>
<table name="files" alias="files" />
<table name="member" type="left join">
<conditions>
<condition operation="equal" column="files.member_srl" default="member.member_srl" />
</conditions>
</table>
<table name="documents" type="left join">
<conditions>
<condition operation="equal" column="files.upload_target_srl" default="documents.document_srl" />
</conditions>
</table>
<table name="comments" type="left join">
<conditions>
<condition operation="equal" column="files.upload_target_srl" default="comments.comment_srl" />
</conditions>
</table>
</tables>
<columns>
<column name="files.*" />
</columns>
<conditions>
<condition operation="in" column="files.module_srl" var="s_module_srl" />
<condition operation="notin" column="files.module_srl" var="exclude_module_srl" pipe="and" />
<condition operation="equal" column="files.isvalid" var="isvalid" pipe="and" />
<condition operation="equal" column="files.direct_download" var="direct_download" pipe="and" />
<condition operation="below" column="files.regdate" var="regdate_before" pipe="and" />
<group pipe="and">
<condition operation="in" column="documents.status" var="document_status" />
<condition operation="null" column="documents.status" pipe="or" />
</group>
<group pipe="and">
<condition operation="in" column="comments.is_secret" var="comment_is_secret" />
<condition operation="null" column="comments.is_secret" pipe="or" />
</group>
<group pipe="and">
<condition operation="like" column="files.source_filename" var="s_filename" pipe="or" />
<condition operation="more" column="files.file_size" var="s_filesize_more" pipe="or" />
<condition operation="less" column="files.file_size" var="s_filesize_less" pipe="or" />
<condition operation="more" column="files.download_count" var="s_download_count" pipe="or" />
<condition operation="like_prefix" column="files.regdate" var="s_regdate" pipe="or" />
<condition operation="like_prefix" column="files.ipaddress" var="s_ipaddress" pipe="or" />
<condition operation="like" column="member.user_id" var="s_user_id" pipe="or" />
<condition operation="like" column="member.user_name" var="s_user_name" pipe="or" />
<condition operation="like" column="member.nick_name" var="s_nick_name" pipe="or" />
</group>
</conditions>
<navigation>
<index var="sort_index" default="files.file_srl" order="desc" />
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />
</navigation>
</query>