Changeset 19684

Timestamp:

2010/11/28 21:54:02 (10 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19683

bzr:committer:

Kentaro Ohkouchi <nanasess@fsm.ne.jp>

bzr:file-ids:

data/class/pages/admin/LC_Page_Admin_Home.php 15287@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2FLC_Page_Admin_Home.php
data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php 17293@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_ProductSelect.php
data/class/pages/products/LC_Page_Products_Detail.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_Detail.php
data/class/pages/products/LC_Page_Products_List.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_List.php
data/class/pages/shopping/LC_Page_Shopping_Payment.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Payment.php
data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php 16839@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fupgrade%2Fhelper%2FLC_Upgrade_Helper_Json.php
data/class/pages/upgrade/helper/LC_Upgrade_Helper_Log.php 16839@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fupgrade%2Fhelper%2FLC_Upgrade_Helper_Log.php
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
data/require_classes.php 18500@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4-dev%2Fdata%2Frequire_classes.php
html/test/upgrade/index.php 16949@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Ftest%2Fupgrade%2Findex.php

bzr:mapping-version:

v4

bzr:merge:

nanasess@fsm.ne.jp-20101128125130-77eai4d9gtxo7qg2

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

nanasess@fsm.ne.jp-20101128125355-isvevp1s3p4xiktp

bzr:revno:

2414

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/pages/admin/LC_Page_Admin_Home.php nanasess@fsm.ne.jp-20101128125130-77eai4d9gtxo7qg2
data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php nanasess@fsm.ne.jp-20101128125130-77eai4d9gtxo7qg2
data/class/pages/products/LC_Page_Products_Detail.php nanasess@fsm.ne.jp-20101128125130-77eai4d9gtxo7qg2
data/class/pages/products/LC_Page_Products_List.php nanasess@fsm.ne.jp-20101128125130-77eai4d9gtxo7qg2
data/class/pages/shopping/LC_Page_Shopping_Payment.php nanasess@fsm.ne.jp-20101128125130-77eai4d9gtxo7qg2
data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php nanasess@fsm.ne.jp-20101128125130-77eai4d9gtxo7qg2
data/class/pages/upgrade/helper/LC_Upgrade_Helper_Log.php nanasess@fsm.ne.jp-20101128125130-77eai4d9gtxo7qg2
data/require_classes.php nanasess@fsm.ne.jp-20101128125130-77eai4d9gtxo7qg2
html/test/upgrade/index.php nanasess@fsm.ne.jp-20101128125130-77eai4d9gtxo7qg2

bzr:timestamp:

2010-11-28 21:53:55.642999887 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2010-11-28T12:53:55.643000Z

Message:

#635 処理の単純化

• Service/JSON.php の宣言を html/require_class.php へ移動

Location:

branches/version-2_5-dev

Files:

• data/class/pages/admin/LC_Page_Admin_Home.php (modified) (1 diff)
• data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php (modified) (1 diff)
• data/class/pages/products/LC_Page_Products_Detail.php (modified) (2 diffs)
• data/class/pages/products/LC_Page_Products_List.php (modified) (1 diff)
• data/class/pages/shopping/LC_Page_Shopping_Payment.php (modified) (1 diff)
• data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php (modified) (1 diff)
• data/class/pages/upgrade/helper/LC_Upgrade_Helper_Log.php (modified) (1 diff)
• data/require_classes.php (modified) (2 diffs)
• html/test/upgrade/index.php (modified) (1 diff)

branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php

@@ -24 +24 @@
 // {{{ requires
 require_once CLASS_PATH . "pages/admin/LC_Page_Admin.php";
-require_once DATA_PATH . 'module/Services/JSON.php';
 require_once DATA_PATH . 'module/Request.php';
 

branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php

@@ -25 +25 @@
 // {{{ requires
 require_once(CLASS_PATH . "pages/admin/LC_Page_Admin.php");
-require_once(DATA_PATH . 'module/Services/JSON.php');
 
 /**

branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php

@@ -158 +158 @@
         $this->tpl_product_type = $objProduct->classCategories[$product_id]['']['']['product_type'];
 
-        require_once DATA_PATH . 'module/Services/JSON.php';
         $objJson = new Services_JSON();
         $this->tpl_javascript .= 'classCategories = ' . $objJson->encode($objProduct->classCategories[$product_id]) . ';';
@@ -483 +482 @@
             : '';
 
-        require_once DATA_PATH . 'module/Services/JSON.php';
         $this->js_lnOnload .= 'fnSetClassCategories('
             . 'document.form1, '

branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php

@@ -493 +493 @@
         $productsClassCategories = $objProduct->classCategories;
 
-        require_once DATA_PATH . 'module/Services/JSON.php';
         $objJson = new Services_JSON();
         $this->tpl_javascript .= 'productsClassCategories = ' . $objJson->encode($productsClassCategories) . '; ';

branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php

@@ -24 +24 @@
 // {{{ requires
 require_once(CLASS_PATH . "pages/LC_Page.php");
-require_once(DATA_PATH . 'module/Services/JSON.php');
 
 /**

branches/version-2_5-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php

@@ -1 +1 @@
 <?php
-require_once DATA_PATH . 'module/Services/JSON.php';
 /**
  * Enter description here...

branches/version-2_5-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Log.php

@@ -21 +21 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-
-require_once DATA_PATH . 'module/Services/JSON.php';
 
 /**

branches/version-2_5-dev/data/require_classes.php

@@ -22 +22 @@
  */
 
+require_once(DATA_PATH . "module/Services/JSON.php");
 require_once(CLASS_EX_PATH . "util_extends/GC_Utils_Ex.php");
 require_once(CLASS_EX_PATH . "util_extends/SC_Utils_Ex.php");
@@ -56 +57 @@
 require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_Purchase_Ex.php");
 // require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_Plugin_Ex.php");
-
 ?>

branches/version-2_5-dev/html/test/upgrade/index.php

@@ -24 +24 @@
 // {{{ requires
 require_once '../../require.php';
-require_once DATA_PATH . 'module/Services/JSON.php';
 
 /**