Cloud computing platform
Révision | 78afba035a1f216d0dee0814735f918d4b3cd40f (tree) |
---|---|
l'heure | 2016-02-04 13:50:35 |
Auteur | naoki hirata <naoki@magi...> |
Commiter | naoki hirata |
ウィジェット一覧画面更新。
@@ -142,8 +142,8 @@ INSERT INTO _widgets | ||
142 | 142 | ('ec_menu', 'Eコマース-商品メニュー', 'menu', 'commerce', '2.1.0', '', 'Naoki Hirata', 'Magic3.org', 'GPL', 10, 'Eコマースの商品メニュー。カテゴリで取得した商品一覧をEコマースメインウィジェットに表示させる。', '', 'jquery.jstree;menudef_detail=ckeditor_m3toolbar;', true, true, true, false, false,true, 0, 1, -1, '2013-1-18', now(), now()); |
143 | 143 | DELETE FROM _widgets WHERE wd_id = 'ec_category_menu'; |
144 | 144 | INSERT INTO _widgets |
145 | -(wd_id, wd_name, wd_type, wd_category_id, wd_version, wd_params, wd_author, wd_copyright, wd_license, wd_official_level, wd_description, wd_read_scripts, wd_read_css, wd_available, wd_editable, wd_has_admin, wd_enable_operation, wd_use_instance_def, wd_initialized, wd_launch_index, wd_cache_type, wd_view_control_type, wd_install_dt, wd_create_dt) VALUES | |
146 | -('ec_category_menu', 'Eコマース-カテゴリーメニュー', 'ECCM', 'commerce', '1.0.0', '', 'Naoki Hirata', 'Magic3.org', 'GPL', 10, 'Eコマースカテゴリメニュー', false, false, true, true, true, false, false,true, 0, 1, -1, now(), now()); | |
145 | +(wd_id, wd_name, wd_status, wd_type, wd_category_id, wd_version, wd_params, wd_author, wd_copyright, wd_license, wd_official_level, wd_description, wd_read_scripts, wd_read_css, wd_available, wd_editable, wd_has_admin, wd_enable_operation, wd_use_instance_def, wd_initialized, wd_launch_index, wd_cache_type, wd_view_control_type, wd_install_dt, wd_create_dt) VALUES | |
146 | +('ec_category_menu', 'Eコマース-カテゴリーメニュー(廃止予定)', -1, 'ECCM', 'commerce', '1.0.0', '', 'Naoki Hirata', 'Magic3.org', 'GPL', 10, 'Eコマースカテゴリメニュー', false, false, true, true, true, false, false,true, 0, 1, -1, now(), now()); | |
147 | 147 | DELETE FROM _widgets WHERE wd_id = 'ec_cart'; |
148 | 148 | INSERT INTO _widgets |
149 | 149 | (wd_id, wd_name, wd_category_id, wd_version, wd_author, wd_copyright, wd_license, wd_official_level, wd_description, wd_has_admin, wd_initialized, wd_launch_index, wd_cache_type, wd_view_control_type, wd_release_dt, wd_install_dt, wd_create_dt) VALUES |
@@ -8,7 +8,7 @@ | ||
8 | 8 | * |
9 | 9 | * @package Magic3 Framework |
10 | 10 | * @author 平田直毅(Naoki Hirata) <naoki@aplo.co.jp> |
11 | - * @copyright Copyright 2006-2015 Magic3 Project. | |
11 | + * @copyright Copyright 2006-2016 Magic3 Project. | |
12 | 12 | * @license http://www.gnu.org/copyleft/gpl.html GPL License |
13 | 13 | * @version SVN: $Id$ |
14 | 14 | * @link http://www.magic3.org |
@@ -883,7 +883,9 @@ class admin_mainWidgetlistWidgetContainer extends admin_mainBaseWidgetContainer | ||
883 | 883 | |
884 | 884 | // 管理画面がないときは、詳細ボタンを使用不可にする |
885 | 885 | $detailButtonEnabled = ''; |
886 | + $idStr = $this->convertToDispString($widgetId); | |
886 | 887 | if (!$fetchedRow['wd_has_admin']) $detailButtonEnabled = 'disabled'; |
888 | + if (!empty($detailButtonEnabled)) $idStr = ''; // 設定画面の表示をキャンセル | |
887 | 889 | |
888 | 890 | // 新規に追加されたウィジェットかチェック |
889 | 891 | $idText = $this->convertToDispString($widgetId); |
@@ -956,7 +958,7 @@ class admin_mainWidgetlistWidgetContainer extends admin_mainBaseWidgetContainer | ||
956 | 958 | $row = array( |
957 | 959 | 'no' => $index + 1, // 行番号 |
958 | 960 | 'serial' => $this->convertToDispString($fetchedRow['wd_serial']), // シリアル番号 |
959 | - 'id' => $this->convertToDispString($widgetId), // ID | |
961 | + 'id' => $idStr, // ID | |
960 | 962 | 'id_text' => $idText, |
961 | 963 | 'name' => $this->convertToDispString($fetchedRow['wd_name']), // 名前 |
962 | 964 | 'version' => $this->convertToDispString($version), // バージョン |
@@ -5,7 +5,7 @@ | ||
5 | 5 | * |
6 | 6 | * @package Magic3 Framework |
7 | 7 | * @author 平田直毅(Naoki Hirata) <naoki@aplo.co.jp> |
8 | - * @copyright Copyright 2006-2015 Magic3 Project. | |
8 | + * @copyright Copyright 2006-2016 Magic3 Project. | |
9 | 9 | * @license http://www.gnu.org/copyleft/gpl.html GPL License |
10 | 10 | * @version SVN: $Id$ |
11 | 11 | * @link http://www.magic3.org |
@@ -41,6 +41,7 @@ function deleteline(lineNo, serialNo){ | ||
41 | 41 | return false; |
42 | 42 | } |
43 | 43 | function detailline(widgetId){ |
44 | + if (!widgetId) return false; | |
44 | 45 | //m3ShowStandardWindow("?cmd=configwidget&openby=all&widget=" + widgetId); |
45 | 46 | m3ShowConfigWindow(widgetId, 0, 0); |
46 | 47 | return false; |