From 7185fb8c859a770c71d1523520371c5b1e1a02de Mon Sep 17 00:00:00 2001 From: shydah Date: Tue, 23 Aug 2022 21:50:07 +0900 Subject: [PATCH 1/2] Fix typo of dispDocumentAdminList --- modules/document/document.admin.view.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php index 3355d11c0..4636d6f04 100644 --- a/modules/document/document.admin.view.php +++ b/modules/document/document.admin.view.php @@ -40,7 +40,7 @@ class documentAdminView extends document $args->page = Context::get('page'); // /< Page $args->list_count = 30; // /< the number of posts to display on a single page $args->page_count = 5; // /< the number of pages that appear in the page navigation - + $args->search_target = Context::get('search_target'); // /< search (title, contents ...) $args->search_keyword = Context::get('search_keyword'); // /< keyword to search if ($args->search_target === 'member_srl') @@ -56,7 +56,7 @@ class documentAdminView extends document $args->sort_index = 'list_order'; // /< sorting value $args->module_srl = Context::get('module_srl'); $args->statusList = array($this->getConfigStatus('public'), $this->getConfigStatus('secret'), $this->getConfigStatus('temp')); - + // get a list $oDocumentModel = getModel('document'); $columnList = array('document_srl', 'module_srl', 'category_srl', 'member_srl', 'title', 'nick_name', 'comment_count', 'trackback_count', 'readed_count', 'voted_count', 'blamed_count', 'regdate', 'ipaddress', 'status'); @@ -104,7 +104,7 @@ class documentAdminView extends document } } Context::set('module_list', $module_list); - + // Get anonymous nicknames $anonymous_member_srls = array(); foreach($output->data as $oDocument) @@ -121,14 +121,14 @@ class documentAdminView extends document $member_output = executeQueryArray('member.getMembers', $member_args); if($member_output) { - $member_nick_neme = array(); + $member_nick_name = array(); foreach($member_output->data as $member) { - $member_nick_neme[$member->member_srl] = $member->nick_name; + $member_nick_name[$member->member_srl] = $member->nick_name; } } } - Context::set('member_nick_name', $member_nick_neme); + Context::set('member_nick_name', $member_nick_name); $security = new Security(); $security->encodeHTML('search_target', 'search_keyword'); @@ -176,7 +176,7 @@ class documentAdminView extends document $args->list_count = 20; // /< the number of posts to display on a single page $args->page_count = 10; // /< the number of pages that appear in the page navigation $args->order_type = strtolower(Context::get('order_type')) === 'asc' ? 'asc' : 'desc'; - + // select sort method $sort_index = Context::get('sort_index'); if (!in_array($sort_index, array('declared_latest', 'declared_count', 'regdate'))) @@ -184,7 +184,7 @@ class documentAdminView extends document $sort_index = 'declared_latest'; } Context::set('sort_index', $sort_index); - + // get latest declared list if ($sort_index === 'declared_latest') { @@ -325,7 +325,7 @@ class documentAdminView extends document } else { - $aliases = $output->data; + $aliases = $output->data; } Context::set('aliases', $aliases); From c64f012ac57f6470a811143d86197d149a3e0818 Mon Sep 17 00:00:00 2001 From: Chanyoung Oh Date: Wed, 24 Aug 2022 01:23:29 +0900 Subject: [PATCH 2/2] =?UTF-8?q?#1984=20=EB=B3=B4=EC=99=84=20-=20PR?= =?UTF-8?q?=EA=B3=BC=20=EA=B4=80=EA=B3=84=EC=97=86=EB=8A=94=20=EC=97=90?= =?UTF-8?q?=EB=94=94=ED=84=B0=20=EC=9E=90=EB=8F=99=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EB=90=98=EB=8F=8C=EB=A6=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 에디터에 의해 자동으로 수정된 PR과 관계없는 부분을 되돌림 --- modules/document/document.admin.view.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php index 4636d6f04..3b9032671 100644 --- a/modules/document/document.admin.view.php +++ b/modules/document/document.admin.view.php @@ -40,7 +40,7 @@ class documentAdminView extends document $args->page = Context::get('page'); // /< Page $args->list_count = 30; // /< the number of posts to display on a single page $args->page_count = 5; // /< the number of pages that appear in the page navigation - + $args->search_target = Context::get('search_target'); // /< search (title, contents ...) $args->search_keyword = Context::get('search_keyword'); // /< keyword to search if ($args->search_target === 'member_srl') @@ -56,7 +56,7 @@ class documentAdminView extends document $args->sort_index = 'list_order'; // /< sorting value $args->module_srl = Context::get('module_srl'); $args->statusList = array($this->getConfigStatus('public'), $this->getConfigStatus('secret'), $this->getConfigStatus('temp')); - + // get a list $oDocumentModel = getModel('document'); $columnList = array('document_srl', 'module_srl', 'category_srl', 'member_srl', 'title', 'nick_name', 'comment_count', 'trackback_count', 'readed_count', 'voted_count', 'blamed_count', 'regdate', 'ipaddress', 'status'); @@ -104,7 +104,7 @@ class documentAdminView extends document } } Context::set('module_list', $module_list); - + // Get anonymous nicknames $anonymous_member_srls = array(); foreach($output->data as $oDocument) @@ -176,7 +176,7 @@ class documentAdminView extends document $args->list_count = 20; // /< the number of posts to display on a single page $args->page_count = 10; // /< the number of pages that appear in the page navigation $args->order_type = strtolower(Context::get('order_type')) === 'asc' ? 'asc' : 'desc'; - + // select sort method $sort_index = Context::get('sort_index'); if (!in_array($sort_index, array('declared_latest', 'declared_count', 'regdate'))) @@ -184,7 +184,7 @@ class documentAdminView extends document $sort_index = 'declared_latest'; } Context::set('sort_index', $sort_index); - + // get latest declared list if ($sort_index === 'declared_latest') { @@ -325,7 +325,7 @@ class documentAdminView extends document } else { - $aliases = $output->data; + $aliases = $output->data; } Context::set('aliases', $aliases);