[Svn-src-all:1277] [version-2_5-dev 20166] #964 getMode()メソッドのリファクタリング。入れ子とで使っている場合の修正等
coelacanth
admin ＠ mail.ec-cube.net
2011年 2月 15日 (火) 14:42:28 JST
Subversion committed to /home/svn/open 20166
http://svn.ec-cube.net/open_trac/changeset/20166
┌────────────────────────────┐
│更新者 : coelacanth │
│更新日時: 2011-02-15 14:42:28 +0900 (火, 15 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#964 getMode()メソッドのリファクタリング。入れ子とで使っている場合の修正等
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php 2011-02-15 05:31:17 UTC (rev 20165)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php 2011-02-15 05:42:28 UTC (rev 20166)
@@ -91,8 +91,8 @@
} else {
$this->tpl_mode = "insert";
}
- //TODO 要リファクタリング(MODE if利用)
- if($this->getMode()!=null) {
+
+ if(!empty($_POST)) {
// POSTデータの引き継ぎ
$this->arrForm = $_POST;
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php 2011-02-15 05:31:17 UTC (rev 20165)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php 2011-02-15 05:42:28 UTC (rev 20166)
@@ -119,27 +119,22 @@
case 'delete_image':
$this->objUpFile->deleteFile($_POST['image_key']);
break;
+
+ case 'pre_edit':
+ if ($_SERVER['REQUEST_METHOD'] == 'GET' && SC_Utils_Ex::sfIsInt($_GET['payment_id'])) {
+ $arrRet = $this->lfGetData($_GET['payment_id']);
+ $this->objFormParam->setParam($arrRet);
+ $this->charge_flg = $arrRet["charge_flg"];
+ // DBデータから画像ファイル名の読込
+ $this->objUpFile->setDBFileList($arrRet);
+ $this->tpl_payment_id = $_GET['payment_id'];
+ }
+ break;
default:
break;
}
- if ($_SERVER['REQUEST_METHOD'] == 'GET') {
- //TODO: 要リファクタリング(MODE switch 入れ子)
- switch($this->getMode()) {
- case 'pre_edit':
- if(SC_Utils_Ex::sfIsInt($_GET['payment_id'])) {
- $arrRet = $this->lfGetData($_GET['payment_id']);
- $this->objFormParam->setParam($arrRet);
- $this->charge_flg = $arrRet["charge_flg"];
- // DBデータから画像ファイル名の読込
- $this->objUpFile->setDBFileList($arrRet);
- $this->tpl_payment_id = $_GET['payment_id'];
- }
- break;
- default:
- break;
- }
- } else {
+ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$this->tpl_payment_id = $_POST['payment_id'];
}
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php 2011-02-15 05:31:17 UTC (rev 20165)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php 2011-02-15 05:42:28 UTC (rev 20166)
@@ -91,8 +91,8 @@
} else {
$this->tpl_mode = "insert";
}
- //TODO 要リファクタリング(MODE if利用)
- if($this->getMode()!=null) {
+
+ if(!empty($_POST)) {
// 入力値の変換
$this->objFormParam->convParam();
$this->arrErr = $this->objFormParam->checkError();
@@ -114,9 +114,9 @@
}
} else {
$arrCol = $this->objFormParam->getKeyList(); // キー名一覧を取得
- $col = SC_Utils_Ex::sfGetCommaList($arrCol);
+ $col = SC_Utils_Ex::sfGetCommaList($arrCol);
+ // DB値の取得
$arrRet = $objQuery->select($col, "dtb_baseinfo");
- // POST値の取得
$this->objFormParam->setParam($arrRet[0]);
}
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php 2011-02-15 05:31:17 UTC (rev 20165)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php 2011-02-15 05:42:28 UTC (rev 20166)
@@ -94,8 +94,8 @@
} else {
$this->tpl_mode = "insert";
}
- //TODO 要リファクタリング(MODE if利用)
- if($this->getMode()!=null) {
+
+ if(!empty($_POST)) {
// 入力値の変換
$this->objFormParam->convParam();
$this->arrErr = $this->lfCheckError();
@@ -117,9 +117,9 @@
}
} else {
$arrCol = $this->objFormParam->getKeyList(); // キー名一覧を取得
- $col = SC_Utils_Ex::sfGetCommaList($arrCol);
+ $col = SC_Utils_Ex::sfGetCommaList($arrCol);
+ // DB値の取得
$arrRet = $objQuery->select($col, "dtb_baseinfo");
- // DB値の取得
$this->objFormParam->setParam($arrRet[0]);
}
Svn-src-all メーリングリストの案内