From 6a77438077c00ac5884f8c007b7569d4583126a3 Mon Sep 17 00:00:00 2001 From: MinSoo Kim Date: Tue, 17 Feb 2015 13:51:04 +0900 Subject: [PATCH 1/2] =?UTF-8?q?#1128=20=ED=86=B5=ED=95=A9=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=EC=97=90=EC=84=9C=20=EC=97=AE=EC=9D=B8=20=EA=B8=80=20?= =?UTF-8?q?=EB=AA=A8=EB=93=88=20=EC=9C=A0=EB=AC=B4=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=9D=BC=20=ED=91=9C=EC=8B=9C=20=EC=A1=B0=EC=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/xpressengine/xe-core/issues/1128 엮인글 모듈이 없는 경우, 엮인글과 관련된 링크를 감춥니다. --- .../integration_search.view.php | 7 +++ .../skins/default/index.html | 12 ++-- .../skins/default/trackback.html | 56 +++++++++---------- 3 files changed, 42 insertions(+), 33 deletions(-) diff --git a/modules/integration_search/integration_search.view.php b/modules/integration_search/integration_search.view.php index df300ac74..49f91ff53 100644 --- a/modules/integration_search/integration_search.view.php +++ b/modules/integration_search/integration_search.view.php @@ -83,6 +83,13 @@ class integration_searchView extends integration_search if($is_keyword) { $oIS = getModel('integration_search'); + $oTrackbackModel = getAdminModel('trackback'); + Context::set('trackback_module_exist', true); + if(!$oTrackbackModel) + { + Context::set('trackback_module_exist', false); + } + switch($where) { case 'document' : diff --git a/modules/integration_search/skins/default/index.html b/modules/integration_search/skins/default/index.html index c701fd677..fb756c196 100644 --- a/modules/integration_search/skins/default/index.html +++ b/modules/integration_search/skins/default/index.html @@ -12,11 +12,13 @@
more
-{@ $output = $search_result['trackback'] } -{@ $search_target = 'title'; } - - -
more
+ + {@ $output = $search_result['trackback'] } + {@ $search_target = 'title'; } + + +
more
+ {@ $output = $search_result['multimedia'] } diff --git a/modules/integration_search/skins/default/trackback.html b/modules/integration_search/skins/default/trackback.html index c37a70e15..f8eefd004 100644 --- a/modules/integration_search/skins/default/trackback.html +++ b/modules/integration_search/skins/default/trackback.html @@ -3,39 +3,39 @@

{$lang->trackback} ({number_format($output->total_count)})

- {$lang->msg_no_result} + {$lang->msg_no_result} - - - - + + + From 0884d0cbd19dcc26ee8cd16509988874f07a0fd1 Mon Sep 17 00:00:00 2001 From: MinSoo Kim Date: Tue, 17 Feb 2015 13:54:45 +0900 Subject: [PATCH 2/2] =?UTF-8?q?#1128=20=ED=86=B5=ED=95=A9=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=20=EC=83=81=EB=8B=A8=EC=97=90=20=EC=97=AE=EC=9D=B8?= =?UTF-8?q?=EA=B8=80=20=EA=B2=80=EC=83=89=20=EB=A7=81=ED=81=AC=20=EC=9C=A0?= =?UTF-8?q?=EB=AC=B4=EB=A5=BC=20=EB=AA=A8=EB=93=88=20=EC=9C=A0=EB=AC=B4?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=9D=BC=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6a77438077c00ac5884f8c007b7569d4583126a3 에 추가 엮인글 모듈이 없는 경우 상단의 링크도 나타내지 않도록 수정. --- modules/integration_search/skins/default/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/integration_search/skins/default/header.html b/modules/integration_search/skins/default/header.html index 12dcd5cc6..71e5aadc3 100644 --- a/modules/integration_search/skins/default/header.html +++ b/modules/integration_search/skins/default/header.html @@ -27,7 +27,7 @@
  • class="on">{$lang->integration_search}
  • class="on">{$lang->document}
  • class="on">{$lang->comment}
  • -
  • class="on">{$lang->trackback}
  • +
  • class="on">{$lang->trackback}
  • class="on">{$lang->multimedia}
  • class="on">{$lang->file}