• R/O
  • HTTP
  • SSH
  • HTTPS

magic3: Commit

Cloud computing platform


Commit MetaInfo

Révision78afba035a1f216d0dee0814735f918d4b3cd40f (tree)
l'heure2016-02-04 13:50:35
Auteurnaoki hirata <naoki@magi...>
Commiternaoki hirata

Message de Log

ウィジェット一覧画面更新。

Change Summary

Modification

--- a/include/sql/update_widgets.sql
+++ b/include/sql/update_widgets.sql
@@ -142,8 +142,8 @@ INSERT INTO _widgets
142142 ('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());
143143 DELETE FROM _widgets WHERE wd_id = 'ec_category_menu';
144144 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());
147147 DELETE FROM _widgets WHERE wd_id = 'ec_cart';
148148 INSERT INTO _widgets
149149 (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
--- a/widgets/admin_main/include/container/admin_mainWidgetlistWidgetContainer.php
+++ b/widgets/admin_main/include/container/admin_mainWidgetlistWidgetContainer.php
@@ -8,7 +8,7 @@
88 *
99 * @package Magic3 Framework
1010 * @author 平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
11- * @copyright Copyright 2006-2015 Magic3 Project.
11+ * @copyright Copyright 2006-2016 Magic3 Project.
1212 * @license http://www.gnu.org/copyleft/gpl.html GPL License
1313 * @version SVN: $Id$
1414 * @link http://www.magic3.org
@@ -883,7 +883,9 @@ class admin_mainWidgetlistWidgetContainer extends admin_mainBaseWidgetContainer
883883
884884 // 管理画面がないときは、詳細ボタンを使用不可にする
885885 $detailButtonEnabled = '';
886+ $idStr = $this->convertToDispString($widgetId);
886887 if (!$fetchedRow['wd_has_admin']) $detailButtonEnabled = 'disabled';
888+ if (!empty($detailButtonEnabled)) $idStr = ''; // 設定画面の表示をキャンセル
887889
888890 // 新規に追加されたウィジェットかチェック
889891 $idText = $this->convertToDispString($widgetId);
@@ -956,7 +958,7 @@ class admin_mainWidgetlistWidgetContainer extends admin_mainBaseWidgetContainer
956958 $row = array(
957959 'no' => $index + 1, // 行番号
958960 'serial' => $this->convertToDispString($fetchedRow['wd_serial']), // シリアル番号
959- 'id' => $this->convertToDispString($widgetId), // ID
961+ 'id' => $idStr, // ID
960962 'id_text' => $idText,
961963 'name' => $this->convertToDispString($fetchedRow['wd_name']), // 名前
962964 'version' => $this->convertToDispString($version), // バージョン
--- a/widgets/admin_main/include/template/widgetlist.tmpl.html
+++ b/widgets/admin_main/include/template/widgetlist.tmpl.html
@@ -5,7 +5,7 @@
55 *
66 * @package Magic3 Framework
77 * @author 平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
8- * @copyright Copyright 2006-2015 Magic3 Project.
8+ * @copyright Copyright 2006-2016 Magic3 Project.
99 * @license http://www.gnu.org/copyleft/gpl.html GPL License
1010 * @version SVN: $Id$
1111 * @link http://www.magic3.org
@@ -41,6 +41,7 @@ function deleteline(lineNo, serialNo){
4141 return false;
4242 }
4343 function detailline(widgetId){
44+ if (!widgetId) return false;
4445 //m3ShowStandardWindow("?cmd=configwidget&openby=all&widget=" + widgetId);
4546 m3ShowConfigWindow(widgetId, 0, 0);
4647 return false;
Afficher sur ancien navigateur de dépôt.