diff --git a/modules/trash/queries/getTrashList.xml b/modules/trash/queries/getTrashList.xml index b3728bc12..b73860acc 100644 --- a/modules/trash/queries/getTrashList.xml +++ b/modules/trash/queries/getTrashList.xml @@ -12,6 +12,12 @@ + + + + + + diff --git a/modules/trash/tpl/trash_list.html b/modules/trash/tpl/trash_list.html index 49d395d62..48e9224f5 100644 --- a/modules/trash/tpl/trash_list.html +++ b/modules/trash/tpl/trash_list.html @@ -84,8 +84,6 @@ var no_text_comment = '{$lang->no_text_comment}'; - - - +
diff --git a/modules/trash/trash.admin.view.php b/modules/trash/trash.admin.view.php index 941b776fa..269c24267 100644 --- a/modules/trash/trash.admin.view.php +++ b/modules/trash/trash.admin.view.php @@ -33,8 +33,24 @@ class trashAdminView extends trash $args->page_count = 5; // /< the number of pages that appear in the page navigation $args->originModule = Context::get('originModule'); - $args->search_target = Context::get('search_target'); // /< search (title, contents ...) - $args->search_keyword = Context::get('search_keyword'); // /< keyword to search + $search_target = Context::get('search_target'); // /< search (title, contents ...) + $search_keyword = Context::get('search_keyword'); // /< keyword to search + + switch($search_target) + { + case 'title': + $args->s_title = $search_keyword; + break; + case 'user_id': + $args->s_user_id = $search_keyword; + break; + case 'nick_name': + $args->s_nick_name = $search_keyword; + break; + case 'trash_ipaddress': + $args->s_ipaddress = $search_keyword; + break; + } $oTrashModel = getModel('trash'); $output = $oTrashModel->getTrashList($args);