From 829c1c20ddf33cb566471face1b8b014974648d3 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Tue, 9 Jun 2015 14:41:43 +0900
Subject: [PATCH] =?UTF-8?q?fix=20#1522=20=ED=86=B5=ED=95=A9=EA=B2=80?=
 =?UTF-8?q?=EC=83=89=EC=97=90=EC=84=9C=20=EB=8C=80=EC=83=81=20=EB=AA=A8?=
 =?UTF-8?q?=EB=93=88=EC=9D=B4=20=EC=84=A0=ED=83=9D=EB=90=98=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EC=95=98=EC=9D=84=20=EB=95=8C=20=EA=B2=80=EC=83=89=20?=
 =?UTF-8?q?=EC=A0=9C=ED=95=9C=20-=20=EA=B2=80=EC=83=89=20=EB=8C=80?=
 =?UTF-8?q?=EC=83=81=20=EB=AA=A8=EB=93=88=EC=9D=B4=20=EC=A7=80=EC=A0=95?=
 =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EC=95=98=EC=9D=84=20=EB=95=8C=20?=
 =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EB=AA=A8=EB=93=88=EC=9D=84=20=EB=8C=80?=
 =?UTF-8?q?=EC=83=81=EC=9C=BC=EB=A1=9C=20=EA=B2=80=EC=83=89=ED=95=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=A0=9C=ED=95=9C=20?=
 =?UTF-8?q?=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/integration_search/integration_search.view.php | 4 ++++
 modules/integration_search/lang/lang.xml               | 8 +++++++-
 modules/integration_search/tpl/index.html              | 1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/integration_search/integration_search.view.php b/modules/integration_search/integration_search.view.php
index df300ac74..950d33fe8 100644
--- a/modules/integration_search/integration_search.view.php
+++ b/modules/integration_search/integration_search.view.php
@@ -36,6 +36,8 @@ class integration_searchView extends integration_search
 	{
 		$oFile = getClass('file');
 		$oModuleModel = getModel('module');
+		$logged_info = Context::get('logged_info');
+
 		// Check permissions
 		if(!$this->grant->access) return new Object(-1,'msg_not_permitted');
 
@@ -72,6 +74,8 @@ class integration_searchView extends integration_search
 		else
 			$module_srl_list = explode(',',$config->target_module_srl);
 
+		if(!count($module_srl_list)) return new Object(-1, ($logged_info->is_admin === 'Y') ? 'msg_admin_not_enabled' : 'msg_not_enabled');
+
 		// Set a variable for search keyword
 		$is_keyword = Context::get('is_keyword');
 		// Set page variables
diff --git a/modules/integration_search/lang/lang.xml b/modules/integration_search/lang/lang.xml
index 9114ac742..4db09ec6f 100644
--- a/modules/integration_search/lang/lang.xml
+++ b/modules/integration_search/lang/lang.xml
@@ -68,6 +68,12 @@
 		<value xml:lang="zh-TW"><![CDATA[按"繼續尋找"按鈕繼續搜尋。]]></value>
 		<value xml:lang="ru"><![CDATA['Искать дальше' Если выберете эту кнопку, то продолжится поиск]]></value>
 	</item>
+	<item name="msg_not_enabled">
+		<value xml:lang="ko"><![CDATA[통합 검색을 사용할 수 없습니다.]]></value>
+	</item>
+	<item name="msg_admin_not_enabled">
+		<value xml:lang="ko"><![CDATA[통합 검색을 사용할 수 없습니다. 통합검색 설정에서 대상 모듈을 선택하세요.]]></value>
+	</item>
 	<item name="is_result_text">
 		<value xml:lang="ko"><![CDATA[<strong>'%s'</strong>에 대한 검색결과 <strong>%d</strong>건]]></value>
 		<value xml:lang="en"><![CDATA[There are <strong>%d</strong> result(s) for <strong>'%s'</strong>]]></value>
@@ -264,4 +270,4 @@
 			<value xml:lang="vi"><![CDATA[Bình chọn]]></value>
 		</item>
 	</item>
-</lang>
\ No newline at end of file
+</lang>
diff --git a/modules/integration_search/tpl/index.html b/modules/integration_search/tpl/index.html
index 1835af521..16f6d641d 100644
--- a/modules/integration_search/tpl/index.html
+++ b/modules/integration_search/tpl/index.html
@@ -38,6 +38,7 @@
 			<select class="modulelist_selected" size="8" multiple="multiple" style="display:block;vertical-align:top;margin:5px 0"></select>
 			<a href="#" id="__module_srl_list_target_module_srl" class="x_btn moduleTrigger" data-multiple="true" style="margin:0 -5px 0 0;border-radius:2px 0 0 0px">{$lang->cmd_add}</a>
 			<button type="button" class="x_btn modulelist_del" style="border-radius:0 2px 2px 0">{$lang->cmd_delete}</button>
+			<p class="x_help-block"><strong>{$lang->about_target_module}</strong></p>
 			<script>
 				xe.registerApp(new xe.ModuleListManager('target_module_srl'));
 			</script>