From b0db989bfbd0c3c55d9c56f262b6c12a3aec3502 Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sun, 30 Nov 2014 17:01:42 +0900 Subject: [PATCH 01/10] Update getDocumentCount.xml --- modules/document/queries/getDocumentCount.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/document/queries/getDocumentCount.xml b/modules/document/queries/getDocumentCount.xml index ddc92d1ba..bac018204 100644 --- a/modules/document/queries/getDocumentCount.xml +++ b/modules/document/queries/getDocumentCount.xml @@ -8,7 +8,7 @@ - + From c22279cbb387d436b07a2d56ae61c85cf660fe51 Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sun, 30 Nov 2014 18:24:48 +0900 Subject: [PATCH 02/10] Update document.model.php --- modules/document/document.model.php | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/modules/document/document.model.php b/modules/document/document.model.php index 8723577cd..d74477420 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -562,18 +562,9 @@ class documentModel extends document */ function getDocumentCount($module_srl, $search_obj = NULL) { - // Additional search options - $args =new stdClass(); - $args->module_srl = $module_srl; - $args->s_title = $search_obj->s_title; - $args->s_content = $search_obj->s_content; - $args->s_user_name = $search_obj->s_user_name; - $args->s_member_srl = $search_obj->s_member_srl; - $args->s_ipaddress = $search_obj->s_ipaddress; - $args->s_regdate = $search_obj->s_regdate; - $args->category_srl = $search_obj->category_srl; + $search_obj->module_srl = $module_srl; - $output = executeQuery('document.getDocumentCount', $args); + $output = executeQuery('document.getDocumentCount', $search_obj); // Return total number of $total_count = $output->data->count; return (int)$total_count; @@ -586,17 +577,7 @@ class documentModel extends document */ function getDocumentCountByGroupStatus($search_obj = NULL) { - // Additional search options - $args->module_srl = $search_obj->module_srl; - $args->s_title = $search_obj->s_title; - $args->s_content = $search_obj->s_content; - $args->s_user_name = $search_obj->s_user_name; - $args->s_member_srl = $search_obj->s_member_srl; - $args->s_ipaddress = $search_obj->s_ipaddress; - $args->s_regdate = $search_obj->s_regdate; - $args->category_srl = $search_obj->category_srl; - - $output = executeQuery('document.getDocumentCountByGroupStatus', $args); + $output = executeQuery('document.getDocumentCountByGroupStatus', $search_obj); if(!$output->toBool()) return array(); return $output->data; From d2aabf4780583ba7ca98beffd189134faaef17f9 Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sun, 30 Nov 2014 18:25:29 +0900 Subject: [PATCH 03/10] Update getDocumentCount.xml --- modules/document/queries/getDocumentCount.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/document/queries/getDocumentCount.xml b/modules/document/queries/getDocumentCount.xml index bac018204..598287fd7 100644 --- a/modules/document/queries/getDocumentCount.xml +++ b/modules/document/queries/getDocumentCount.xml @@ -8,7 +8,7 @@ - + From 42e94da9485dcf65dc2a623e59bc806adbf69e5e Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sun, 30 Nov 2014 18:26:09 +0900 Subject: [PATCH 04/10] Update getDocumentCountByGroupStatus.xml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit category_srl 검색에 pipe="and" 가 빠져있고 숫자 filter 연결해둠 --- modules/document/queries/getDocumentCountByGroupStatus.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/document/queries/getDocumentCountByGroupStatus.xml b/modules/document/queries/getDocumentCountByGroupStatus.xml index d9150ca46..f72fafd54 100644 --- a/modules/document/queries/getDocumentCountByGroupStatus.xml +++ b/modules/document/queries/getDocumentCountByGroupStatus.xml @@ -9,7 +9,7 @@ - + From 8f58576bdbf561548653b4a626dbb584a7b54d3a Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sun, 30 Nov 2014 18:28:05 +0900 Subject: [PATCH 05/10] Update getDocumentCount.xml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit category 쪽에 pipe 연결 안 된 오류 수정 이메일 검색 s_email_address 오타 수정 --- modules/document/queries/getDocumentCount.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/document/queries/getDocumentCount.xml b/modules/document/queries/getDocumentCount.xml index 598287fd7..401f47a60 100644 --- a/modules/document/queries/getDocumentCount.xml +++ b/modules/document/queries/getDocumentCount.xml @@ -18,7 +18,7 @@ - + From bdd90c8817d4e21dc4027b4abf05f22da6128e6b Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sun, 30 Nov 2014 18:30:02 +0900 Subject: [PATCH 06/10] Update getDocumentCountByGroupStatus.xml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit s_email_address 오타 수정 --- modules/document/queries/getDocumentCountByGroupStatus.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/document/queries/getDocumentCountByGroupStatus.xml b/modules/document/queries/getDocumentCountByGroupStatus.xml index f72fafd54..94bcb1894 100644 --- a/modules/document/queries/getDocumentCountByGroupStatus.xml +++ b/modules/document/queries/getDocumentCountByGroupStatus.xml @@ -19,7 +19,7 @@ - + From 3f091c0e1440dd067aaaa98c71cebc416a106f7a Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sun, 30 Nov 2014 18:31:27 +0900 Subject: [PATCH 07/10] Update getDocumentListExtraSort.xml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit s_email_addres 로 적힌 s_email_address 오타 수정 --- modules/document/queries/getDocumentListExtraSort.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/document/queries/getDocumentListExtraSort.xml b/modules/document/queries/getDocumentListExtraSort.xml index e9102cdb0..e843f8900 100644 --- a/modules/document/queries/getDocumentListExtraSort.xml +++ b/modules/document/queries/getDocumentListExtraSort.xml @@ -26,7 +26,7 @@ - + From 038070b5e58ec2833d3872f23a550b95fa42e768 Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sun, 30 Nov 2014 18:32:15 +0900 Subject: [PATCH 08/10] Update getDocumentListUseIndex.xml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit s_email_addres 로 적힌 s_email_address 오타 수정 --- modules/document/queries/getDocumentListUseIndex.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/document/queries/getDocumentListUseIndex.xml b/modules/document/queries/getDocumentListUseIndex.xml index be456edaf..4182a5ad0 100644 --- a/modules/document/queries/getDocumentListUseIndex.xml +++ b/modules/document/queries/getDocumentListUseIndex.xml @@ -25,7 +25,7 @@ - + From b247105635228ea967f4761c3e4bc9b14fc2db77 Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sun, 30 Nov 2014 18:33:55 +0900 Subject: [PATCH 09/10] Update getDocumentListWithinMember.xml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit s_email_address 오타 수정 --- modules/document/queries/getDocumentListWithinMember.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/document/queries/getDocumentListWithinMember.xml b/modules/document/queries/getDocumentListWithinMember.xml index c87994f7c..49792e11d 100644 --- a/modules/document/queries/getDocumentListWithinMember.xml +++ b/modules/document/queries/getDocumentListWithinMember.xml @@ -15,7 +15,7 @@ - + From e7661f74cbc14266425442ec93b239f21e83aed0 Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sun, 30 Nov 2014 18:34:55 +0900 Subject: [PATCH 10/10] Update getTrashList.xml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit s_email_address 오타 수정 --- modules/document/queries/getTrashList.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/document/queries/getTrashList.xml b/modules/document/queries/getTrashList.xml index a6be78d71..fe13af161 100644 --- a/modules/document/queries/getTrashList.xml +++ b/modules/document/queries/getTrashList.xml @@ -26,7 +26,7 @@ - +