From 4e791f683edc3c31e6b35b561c19aa85bb397411 Mon Sep 17 00:00:00 2001 From: naoki hirata Date: Sat, 1 Feb 2014 10:00:51 +0900 Subject: [PATCH] =?utf8?q?=E3=83=9A=E3=83=BC=E3=82=B8=E3=82=B3=E3=83=B3?= =?utf8?q?=E3=83=86=E3=83=B3=E3=83=84=E3=82=BF=E3=82=A4=E3=83=97=E3=81=AB?= =?utf8?q?=E3=80=8Ccommerce=E3=80=8D(E=E3=82=B3=E3=83=9E=E3=83=BC=E3=82=B9?= =?utf8?q?)=E8=BF=BD=E5=8A=A0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- include/manager/pageManager.php | 3 ++- include/manager/systemManager.php | 17 ++++++++++++++--- include/sql/update_widgets.sql | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/include/manager/pageManager.php b/include/manager/pageManager.php index 24683aa4..0da56c49 100644 --- a/include/manager/pageManager.php +++ b/include/manager/pageManager.php @@ -3918,7 +3918,8 @@ class PageManager extends Core // ウィジェットの配置位置に問題があるかどうかを表示 // メインコンテンツとページ属性が一致するかどうかチェック $widgetContentType = $rows[$i]['wd_content_type']; - if (!empty($widgetContentType) && $widgetContentType != $pageContentType && in_array($widgetContentType, $gSystemManager->getAllContentType())){ + if (!empty($widgetContentType) && $widgetContentType != $pageContentType && + (in_array($widgetContentType, $gSystemManager->getAllContentType()) || in_array($widgetContentType, $gSystemManager->getAllFeatureType()))){ //$title = 'ウィジェット配置注意'; $title = 'ページ属性と不一致'; $configImg .= '' . $title . ' '; diff --git a/include/manager/systemManager.php b/include/manager/systemManager.php index c35f034f..01f2efd7 100644 --- a/include/manager/systemManager.php +++ b/include/manager/systemManager.php @@ -10,7 +10,7 @@ * * @package Magic3 Framework * @author 平田直毅(Naoki Hirata) - * @copyright Copyright 2006-2013 Magic3 Project. + * @copyright Copyright 2006-2014 Magic3 Project. * @license http://www.gnu.org/copyleft/gpl.html GPL License * @version SVN: $Id: systemManager.php 6173 2013-07-16 02:23:00Z fishbone $ * @link http://www.magic3.org @@ -676,9 +676,20 @@ class SystemManager extends Core M3_VIEW_TYPE_WIKI, // wiki M3_VIEW_TYPE_USER, // ユーザ作成コンテンツ M3_VIEW_TYPE_EVENT, // イベント - M3_VIEW_TYPE_PHOTO, // フォトギャラリー - M3_VIEW_TYPE_SEARCH); // 検索結果 + M3_VIEW_TYPE_PHOTO); // フォトギャラリー return $contentType; } + /** + * 機能タイプを取得 + * + * @return array 機能タイプ + */ + public function getAllFeatureType() + { + $featureType = array( M3_VIEW_TYPE_DASHBOARD, // ダッシュボード + M3_VIEW_TYPE_SEARCH, // 検索結果 + M3_VIEW_TYPE_COMMERCE); // Eコマース + return $featureType; + } } ?> diff --git a/include/sql/update_widgets.sql b/include/sql/update_widgets.sql index dc29216b..dda8923a 100644 --- a/include/sql/update_widgets.sql +++ b/include/sql/update_widgets.sql @@ -243,8 +243,8 @@ INSERT INTO _widgets ('ec_disp', 'Eコマース - 商品表示', 'product', '1.4.0', 'Naoki Hirata', 'Magic3.org', 'GPL', 10, 'Eコマースの商品表示機能。商品の説明や一覧を表示。', true, true, 10, 1, 2, '2013-7-27', now(), now()); DELETE FROM _widgets WHERE wd_id = 'ec_main'; INSERT INTO _widgets -(wd_id, wd_name, wd_type, wd_edit_content, wd_version, wd_author, wd_copyright, wd_license, wd_official_level, wd_description, wd_has_admin, wd_initialized, wd_cache_type, wd_view_control_type, wd_release_dt, wd_install_dt, wd_create_dt) VALUES -('ec_main', 'Eコマース - メイン', 'product', true, '2.0.0', 'Naoki Hirata', 'Magic3.org', 'GPL', 10, 'Eコマースのメインプログラム。会員登録処理や商品購入処理などを行う。', true, true, 0, 2, '2012-12-07', now(), now()); +(wd_id, wd_name, wd_type, wd_content_type, wd_edit_content, wd_version, wd_author, wd_copyright, wd_license, wd_official_level, wd_description, wd_has_admin, wd_initialized, wd_cache_type, wd_view_control_type, wd_release_dt, wd_install_dt, wd_create_dt) VALUES +('ec_main', 'Eコマース - メイン', 'product', 'commerce', true, '2.0.0', 'Naoki Hirata', 'Magic3.org', 'GPL', 10, 'Eコマースのメインプログラム。会員登録処理や商品購入処理などを行う。', true, true, 0, 2, '2012-12-07', now(), now()); DELETE FROM _widgets WHERE wd_id = 'fontsize'; INSERT INTO _widgets (wd_id, wd_name, wd_version, wd_author, wd_copyright, wd_license, wd_official_level, wd_description, wd_read_scripts, wd_read_css, wd_add_script_lib, wd_add_script_lib_a, wd_has_admin, wd_enable_operation, wd_use_instance_def, wd_initialized, wd_cache_type, wd_view_control_type, wd_install_dt, wd_create_dt) VALUES -- 2.11.0