Changeset 20166 for branches/version-2_5-dev/data/class

Timestamp:

2011/02/15 14:42:28 (15 years ago)

Author:

coelacanth

Message:

#964 getMode()メソッドのリファクタリング。入れ子とで使っている場合の修正等

Location:

branches/version-2_5-dev/data/class/pages/admin/basis

Files:

• LC_Page_Admin_Basis.php (modified) (1 diff)
• LC_Page_Admin_Basis_Payment_Input.php (modified) (1 diff)
• LC_Page_Admin_Basis_Point.php (modified) (2 diffs)
• LC_Page_Admin_Basis_Tradelaw.php (modified) (2 diffs)

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

@@ -92 +92 @@
             $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

@@ -120 +120 @@
             $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

@@ -92 +92 @@
             $this->tpl_mode = "insert";
         }
-        //TODO 要リファクタリング(MODE if利用)
-        if($this->getMode()!=null) {
+
+        if(!empty($_POST)) {
             // 入力値の変換
             $this->objFormParam->convParam();
@@ -115 +115 @@
         } 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

@@ -95 +95 @@
             $this->tpl_mode = "insert";
         }
-        //TODO 要リファクタリング(MODE if利用)
-        if($this->getMode()!=null) {
+
+        if(!empty($_POST)) {
             // 入力値の変換
             $this->objFormParam->convParam();
@@ -118 +118 @@
         } 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]);
         }