Merge pull request #688 from lansi951/board_search_fix

모듈 분류 지정한 경우, 관리페이지에서 게시판 검색 안 되는 버그
xpressengine · May 8, 2014 · caf1664 · caf1664
2 parents c6c05c0 + 6d57455
commit caf1664
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/modules/board/queries/getBoardList.xml b/modules/board/queries/getBoardList.xml
@@ -11,8 +11,8 @@
             <condition operation="like" column="mid" var="s_mid" pipe="or" />
             <condition operation="like" column="browser_title" var="s_browser_title" pipe="or" />
             <condition operation="like" column="comment" var="s_comment" pipe="or" />
-            <condition operation="equal" column="module_category_srl" var="s_module_category_srl" pipe="or" />
         </group>
+        <condition operation="equal" column="module_category_srl" var="s_module_category_srl" pipe="and" />
     </conditions>
     <navigation>
         <index var="sort_index" default="module_srl" order="desc" />

diff --git a/modules/board/tpl/index.html b/modules/board/tpl/index.html
@@ -89,8 +89,9 @@
 <form action="" class="search x_input-append center" no-error-return-url="true">
 	<input loop="$param => $key, $val" cond="!in_array($key, array('mid', 'vid', 'act', 'page', 'search_target', 'search_keyword'))" type="hidden" name="{$key}" value="{$val}" />
 	<select cond="count($module_category)" name="module_category_srl" title="{$lang->module_category}" style="margin-right:4px">
+		<option value="" selected="selected"|cond="!$module_category_srl">{$lang->all}</option>
 		<option value="0" selected="selected"|cond="$module_category_srl==='0'">{$lang->not_exists}</option>
-		<option value="{$key}" loop="$module_category => $key,$val"  selected="selected"|cond="$module_category==$key">{$val->title}</option>
+		<option value="{$key}" loop="$module_category => $key,$val"  selected="selected"|cond="$module_category_srl==$key">{$val->title}</option>
 	</select>
 	<select name="search_target" title="{$lang->search_target}" style="margin-right:4px">
 		<option value="mid" selected="selected"|cond="$search_target=='mid'">{$lang->mid}</option>
@@ -124,4 +125,4 @@
 		}
 	});
 });
-</script>
+</script>