diff --git a/modules/document/document.model.php b/modules/document/document.model.php index 66f923a8d..7daf0f66a 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; diff --git a/modules/document/queries/getDocumentCount.xml b/modules/document/queries/getDocumentCount.xml index ddc92d1ba..401f47a60 100644 --- a/modules/document/queries/getDocumentCount.xml +++ b/modules/document/queries/getDocumentCount.xml @@ -8,7 +8,7 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/modules/document/queries/getDocumentCountByGroupStatus.xml b/modules/document/queries/getDocumentCountByGroupStatus.xml index d9150ca46..94bcb1894 100644 --- a/modules/document/queries/getDocumentCountByGroupStatus.xml +++ b/modules/document/queries/getDocumentCountByGroupStatus.xml @@ -9,7 +9,7 @@ - + @@ -19,7 +19,7 @@ - + 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ - +