From 5a2fe660633956fd326c5682db47f009977551cf Mon Sep 17 00:00:00 2001 From: BJRambo Date: Sun, 18 Dec 2022 00:58:46 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EB=AA=A9=EB=A1=9D?= =?UTF-8?q?=EC=97=90=20=EC=A0=95=EB=A0=AC=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/file/file.admin.model.php | 1 + modules/file/file.admin.view.php | 3 ++- modules/file/tpl/file_list.html | 27 ++++++++++++++++++++++++--- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php index 75220b261..dc538eb93 100644 --- a/modules/file/file.admin.model.php +++ b/modules/file/file.admin.model.php @@ -81,6 +81,7 @@ class fileAdminModel extends file // Set variables $args->sort_index = $obj->sort_index ?? null; + $args->order_type = $obj->order_type ?? 'desc'; $args->page = isset($obj->page) ? ($obj->page ? $obj->page : 1) : 1; $args->list_count = isset($obj->list_count) ? ($obj->list_count? $obj->list_count : 20) : 20; $args->page_count = isset($obj->page_count) ? ($obj->page_count? $obj->page_count : 10) : 10; diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php index 9e5e59794..078dc3a41 100644 --- a/modules/file/file.admin.view.php +++ b/modules/file/file.admin.view.php @@ -27,7 +27,8 @@ class fileAdminView extends file $args->list_count = 30; // /< Number of documents that appear on a single page $args->page_count = 10; // /< Number of pages that appear in the page navigation - $args->sort_index = 'file_srl'; // /< Sorting values + $args->sort_index = Context::get('sort_index') ?? 'file_srl'; // /< Sorting values + $args->order_type = Context::get('order_type') ?? null; $args->isvalid = Context::get('isvalid'); $args->module_srl = Context::get('module_srl'); // Get a list diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html index 417c5680b..551e1726e 100644 --- a/modules/file/tpl/file_list.html +++ b/modules/file/tpl/file_list.html @@ -23,10 +23,31 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; {$lang->file} - {$lang->file_size} - {$lang->cmd_download} + + + {$lang->file_size} + + ▲▼ + + + + + + {$lang->cmd_download} + + ▲▼ + + + {$lang->author} - {$lang->date} + + + {$lang->date} + + ▲▼ + + + {$lang->ipaddress} {$lang->status} From 01ffc522391654aad92ac86e7de67ec9d303544d Mon Sep 17 00:00:00 2001 From: BJRambo Date: Sun, 18 Dec 2022 01:15:30 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EB=AA=A8=EB=93=88=EC=97=90=20=EB=8B=A4=EC=9A=B4=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=20=EA=B0=AF=EC=88=98=20=EC=9D=B4=ED=95=98=EB=A5=BC=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/file/file.admin.model.php | 3 +++ modules/file/lang/en.php | 1 + modules/file/lang/es.php | 1 + modules/file/lang/fr.php | 1 + modules/file/lang/ja.php | 1 + modules/file/lang/ko.php | 1 + modules/file/lang/ru.php | 1 + modules/file/lang/tr.php | 1 + modules/file/lang/vi.php | 1 + modules/file/lang/zh-CN.php | 1 + modules/file/lang/zh-TW.php | 1 + modules/file/queries/getFileList.xml | 3 ++- 12 files changed, 15 insertions(+), 1 deletion(-) diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php index dc538eb93..a52d4a798 100644 --- a/modules/file/file.admin.model.php +++ b/modules/file/file.admin.model.php @@ -204,6 +204,9 @@ class fileAdminModel extends file case 'download_count' : $args->s_download_count = (int)$search_keyword; break; + case 'download_count_less' : + $args->s_download_count_less = (int)$search_keyword; + break; case 'regdate' : $args->s_regdate = $search_keyword; break; diff --git a/modules/file/lang/en.php b/modules/file/lang/en.php index 1fcff9dab..004c438a0 100644 --- a/modules/file/lang/en.php +++ b/modules/file/lang/en.php @@ -62,6 +62,7 @@ $lang->file_search_target_list['filesize_mega_more'] = 'File Size(mbyte, more)'; $lang->file_search_target_list['filesize_less'] = 'File Size(byte, less)'; $lang->file_search_target_list['filesize_mega_less'] = 'File Size(Mb, less)'; $lang->file_search_target_list['download_count'] = 'Downloads(more)'; +$lang->file_search_target_list['download_count_less'] = 'Downloads(less)'; $lang->file_search_target_list['user_id'] = 'User UD'; $lang->file_search_target_list['user_name'] = 'User Name'; $lang->file_search_target_list['nick_name'] = 'Nickname'; diff --git a/modules/file/lang/es.php b/modules/file/lang/es.php index ff6e96685..76696667c 100644 --- a/modules/file/lang/es.php +++ b/modules/file/lang/es.php @@ -29,6 +29,7 @@ $lang->file_search_target_list['filename'] = 'Nombre del archivo'; $lang->file_search_target_list['filesize_more'] = 'Tamaño del archivo(Byte, sobre)'; $lang->file_search_target_list['filesize_mega_more'] = 'Tamaño del archivo(Mb, o mb)'; $lang->file_search_target_list['download_count'] = 'Descargados(Sobre)'; +$lang->file_search_target_list['download_count_less'] = 'Descargados(less)'; $lang->file_search_target_list['user_id'] = 'ID'; $lang->file_search_target_list['user_name'] = 'Nombre'; $lang->file_search_target_list['nick_name'] = 'Apodo'; diff --git a/modules/file/lang/fr.php b/modules/file/lang/fr.php index 933214f56..72d98cf3d 100644 --- a/modules/file/lang/fr.php +++ b/modules/file/lang/fr.php @@ -24,6 +24,7 @@ $lang->msg_exceeds_limit_size = 'La mesure de l\'(des) Annexe(s) est plus grande $lang->file_search_target_list['filename'] = 'Nom de Fichier'; $lang->file_search_target_list['filesize_more'] = 'Mesure de Fichier(octet, surplus)'; $lang->file_search_target_list['download_count'] = 'Telecharges(surplus)'; +$lang->file_search_target_list['download_count_less'] = 'Telecharges(less)'; $lang->file_search_target_list['regdate'] = 'Enrgistre'; $lang->file_search_target_list['ipaddress'] = 'Adresse IP'; $lang->msg_not_allowed_outlink = 'It is not allowed to download files not from this site.'; diff --git a/modules/file/lang/ja.php b/modules/file/lang/ja.php index 0ba2105f1..4eafa565b 100644 --- a/modules/file/lang/ja.php +++ b/modules/file/lang/ja.php @@ -37,6 +37,7 @@ $lang->file_search_target_list['filesize_mega_more'] = 'ファイルサイズ(Mb $lang->file_search_target_list['filesize_less'] = 'ファイルサイズ(byte, 以下)'; $lang->file_search_target_list['filesize_mega_less'] = 'ファイルサイズ(Mb, 以下)'; $lang->file_search_target_list['download_count'] = 'ダウンロード数（以上）'; +$lang->file_search_target_list['download_count_less'] = 'ダウンロード数(以下)'; $lang->file_search_target_list['user_id'] = 'ユーザーＩＤ'; $lang->file_search_target_list['user_name'] = '名前'; $lang->file_search_target_list['nick_name'] = 'ニックネーム'; diff --git a/modules/file/lang/ko.php b/modules/file/lang/ko.php index 02d9890cc..25ae1619e 100644 --- a/modules/file/lang/ko.php +++ b/modules/file/lang/ko.php @@ -63,6 +63,7 @@ $lang->file_search_target_list['filesize_mega_more'] = '파일 크기(MB, 이상 $lang->file_search_target_list['filesize_less'] = '파일 크기(byte, 이하)'; $lang->file_search_target_list['filesize_mega_less'] = '파일 크기(MB, 이하)'; $lang->file_search_target_list['download_count'] = '다운로드 횟수(이상)'; +$lang->file_search_target_list['download_count_less'] = '다운로드 횟수(이하)'; $lang->file_search_target_list['user_id'] = '아이디'; $lang->file_search_target_list['user_name'] = '이름'; $lang->file_search_target_list['nick_name'] = '닉네임'; diff --git a/modules/file/lang/ru.php b/modules/file/lang/ru.php index ce04e487c..8b9839969 100644 --- a/modules/file/lang/ru.php +++ b/modules/file/lang/ru.php @@ -30,6 +30,7 @@ $lang->file_search_target_list['filesize_mega_more'] = 'Размер файла( $lang->file_search_target_list['filesize_less'] = 'Размер файла(Байт, ниже)'; $lang->file_search_target_list['filesize_mega_less'] = 'Размер файла(Мегабайт, ниже)'; $lang->file_search_target_list['download_count'] = 'Скачано(свыше)'; +$lang->file_search_target_list['download_count_less'] = 'Скачано(ниже)'; $lang->file_search_target_list['user_id'] = 'ID'; $lang->file_search_target_list['user_name'] = 'Имя'; $lang->file_search_target_list['nick_name'] = 'Ник'; diff --git a/modules/file/lang/tr.php b/modules/file/lang/tr.php index 85962a4a1..8b254201c 100644 --- a/modules/file/lang/tr.php +++ b/modules/file/lang/tr.php @@ -34,6 +34,7 @@ $lang->file_search_target_list['filesize_mega_more'] = 'Dosya Boyutu(mbyte, üst $lang->file_search_target_list['filesize_less'] = 'Dosya Boyutu(byte, düşük)'; $lang->file_search_target_list['filesize_mega_less'] = 'Dosya Boyutu(Mb, düşük)'; $lang->file_search_target_list['download_count'] = 'İndirmeler(daha fazla)'; +$lang->file_search_target_list['download_count_less'] = 'İndirmeler(düşük)'; $lang->file_search_target_list['user_id'] = 'Kullanıcı Kimliği'; $lang->file_search_target_list['user_name'] = 'Kullanıcı İsmi'; $lang->file_search_target_list['nick_name'] = 'Rumuz'; diff --git a/modules/file/lang/vi.php b/modules/file/lang/vi.php index 8b826bcec..5162a52b1 100644 --- a/modules/file/lang/vi.php +++ b/modules/file/lang/vi.php @@ -33,6 +33,7 @@ $lang->file_search_target_list['filesize_mega_more'] = 'Dung lượng(Tối thi $lang->file_search_target_list['filesize_less'] = 'Dung lượng(Tối đa Byte)'; $lang->file_search_target_list['filesize_mega_less'] = 'Dung lượng(Tối đa MB)'; $lang->file_search_target_list['download_count'] = 'Lượt Download'; +$lang->file_search_target_list['download_count_less'] = 'Lượt Download(Tối đa Lượt)'; $lang->file_search_target_list['user_id'] = 'ID đăng nhập'; $lang->file_search_target_list['user_name'] = 'Tên Sử dụng'; $lang->file_search_target_list['regdate'] = 'Ngày gửi'; diff --git a/modules/file/lang/zh-CN.php b/modules/file/lang/zh-CN.php index cc84af044..b284834db 100644 --- a/modules/file/lang/zh-CN.php +++ b/modules/file/lang/zh-CN.php @@ -32,6 +32,7 @@ $lang->file_search_target_list['filesize_mega_more'] = '文件大小(Mb, 以上) $lang->file_search_target_list['filesize_less'] = '文件大小(byte, 以下)'; $lang->file_search_target_list['filesize_mega_less'] = '文件大小(Mb, 以下)'; $lang->file_search_target_list['download_count'] = '下载次数(以上)'; +$lang->file_search_target_list['download_count_less'] = '下载次数(以下)'; $lang->file_search_target_list['user_id'] = '用户名'; $lang->file_search_target_list['user_name'] = '姓名'; $lang->file_search_target_list['nick_name'] = '昵称'; diff --git a/modules/file/lang/zh-TW.php b/modules/file/lang/zh-TW.php index 1be588670..e68d04dcd 100644 --- a/modules/file/lang/zh-TW.php +++ b/modules/file/lang/zh-TW.php @@ -34,6 +34,7 @@ $lang->file_search_target_list['filesize_mega_more'] = '檔案大小(Mb, 以上) $lang->file_search_target_list['filesize_less'] = '檔案大小(byte, 以下)'; $lang->file_search_target_list['filesize_mega_less'] = '檔案大小(Mb, 以下)'; $lang->file_search_target_list['download_count'] = '下載次數(以上)'; +$lang->file_search_target_list['download_count_less'] = '下載次數(以下)'; $lang->file_search_target_list['user_id'] = '帳號'; $lang->file_search_target_list['user_name'] = '姓名'; $lang->file_search_target_list['nick_name'] = '暱稱'; diff --git a/modules/file/queries/getFileList.xml b/modules/file/queries/getFileList.xml index 43461e9fd..7a65234b9 100644 --- a/modules/file/queries/getFileList.xml +++ b/modules/file/queries/getFileList.xml @@ -23,7 +23,8 @@ - + + From b1a016c43d176c0e8e5c963f9734c6e5b08c717b Mon Sep 17 00:00:00 2001 From: BJRambo Date: Sun, 18 Dec 2022 01:21:13 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=BF=BC=EB=A6=AC=EC=97=90=20order=20type?= =?UTF-8?q?=20=EB=B3=80=EC=88=98=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EB=8F=99=EC=9E=91=EC=9D=80=20desc?= =?UTF-8?q?=EB=A1=9C=20=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/file/queries/getFileList.xml | 2 +- modules/file/queries/getFileListByTargetStatus.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/file/queries/getFileList.xml b/modules/file/queries/getFileList.xml index 7a65234b9..de5232747 100644 --- a/modules/file/queries/getFileList.xml +++ b/modules/file/queries/getFileList.xml @@ -33,7 +33,7 @@ - + diff --git a/modules/file/queries/getFileListByTargetStatus.xml b/modules/file/queries/getFileListByTargetStatus.xml index 999d87e02..fcc60f87a 100644 --- a/modules/file/queries/getFileListByTargetStatus.xml +++ b/modules/file/queries/getFileListByTargetStatus.xml @@ -47,7 +47,7 @@ - +