Changeset 20440 for branches/version-2_5-dev/data/class/pages/admin

Timestamp:

2011/02/28 15:36:52 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20110228052022-w5dyet8rz62ztoqm

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 15559@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_ProductClass.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110228063558-9fdg5qsqhgwsazqx

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110228063632-zwilkj3syj4mqr5x

bzr:revno:

3168

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php ohkouchi@loop-az.jp-20110228063558-9fdg5qsqhgwsazqx

bzr:timestamp:

2011-02-28 15:36:32.125999928 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-28T06:36:32.126000Z

Message:

#1063([管理画面]商品管理（商品規格登録）：規格が無い商品に規格を新規登録するとエラー)

File:

• branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php (modified) (9 diffs)

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

@@ -102 +102 @@
             $this->arrErr = $this->lfProductClassError($this->arrForm);
             if (empty($this->arrErr)){
-                $this->tpl_mainpage = 'products/product_class_confirm.tpl';
+                $this->tpl_mainpage = 'products/product_class_confirm.tpl';
                 $this->lfProductConfirmPage($this->arrForm); // 確認ページ表示
             } else {
-                $this->doPreEdit($objFormParam->getValue('product_id'), false ,true);
+                $this->doPreEdit($objFormParam->getValue('product_id'), false ,true);
                 // Hiddenからのデータを引き継ぐ
-                $this->objDownFile->setHiddenFileList($_POST);
-                // HIDDEN用に配列を渡す。
-                $this->arrHidden = array_merge((array)$this->arrHidden, (array)$this->objDownFile->getHiddenFileList());
-                // Form用に配列を渡す。
-                $this->arrForm = array_merge((array)$this->arrForm, (array)$this->objDownFile->getFormKikakuDownFile());
+                $this->objDownFile->setHiddenFileList($_POST);
+                // HIDDEN用に配列を渡す。
+                $this->arrHidden = array_merge((array)$this->arrHidden, (array)$this->objDownFile->getHiddenFileList());
+                // Form用に配列を渡す。
+                $this->arrForm = array_merge((array)$this->arrForm, (array)$this->objDownFile->getFormKikakuDownFile());
                 $this->doDisp($objFormParam->getValue('product_id'),
                               $objFormParam->getValue('select_class_id1'),
@@ -127 +127 @@
             $this->doPreEdit($objFormParam->getValue('product_id'));
             // HIDDEN用に配列を渡す。
-            $this->arrHidden = array_merge((array)$this->arrHidden, (array)$this->objDownFile->getHiddenFileList());
+            $this->arrHidden = array_merge((array)$this->arrHidden, (array)$this->objDownFile->getHiddenFileList());
             break;
 
@@ -143 +143 @@
             // 編集画面用パラメータをセット
             $this->doPreEdit($product_id, true);
-            // Hiddenからのデータを引き継ぐ
-            $this->objDownFile->setHiddenKikakuFileList($_POST);
+            // Hiddenからのデータを引き継ぐ
+            $this->objDownFile->setHiddenKikakuFileList($_POST);
             // ファイル存在チェック
             $this->arrErr = array_merge((array)$this->arrErr, (array)$this->objDownFile->checkEXISTS($down_key));
@@ -150 +150 @@
             $this->arrErr[$down_key] = $this->objDownFile->makeTempDownFile($down_key);
             // HIDDEN用に配列を渡す。
-            $this->arrHidden = array_merge((array)$this->arrHidden, (array)$this->objDownFile->getHiddenFileList());
-            // Form用に配列を渡す。
-            $this->arrForm = array_merge((array)$this->arrForm, (array)$this->objDownFile->getFormKikakuDownFile());
+            $this->arrHidden = array_merge((array)$this->arrHidden, (array)$this->objDownFile->getHiddenFileList());
+            // Form用に配列を渡す。
+            $this->arrForm = array_merge((array)$this->arrForm, (array)$this->objDownFile->getFormKikakuDownFile());
             // 規格の組み合わせ一覧を表示
             $this->doDisp($product_id,
@@ -165 +165 @@
             // 編集画面用パラメータをセット
             $this->doPreEdit($product_id, true);
-            // Hiddenからのデータを引き継ぐ
-            $this->objDownFile->setHiddenKikakuFileList($_POST);
-            // ファイル削除処理
+            // Hiddenからのデータを引き継ぐ
+            $this->objDownFile->setHiddenKikakuFileList($_POST);
+            // ファイル削除処理
             $this->objDownFile->deleteKikakuFile($down_key);
             // HIDDEN用に配列を渡す。
-            $this->arrHidden = array_merge((array)$this->arrHidden, (array)$this->objDownFile->getHiddenFileList());
-            // Form用に配列を渡す。
-            $this->arrForm = array_merge((array)$this->arrForm, (array)$this->objDownFile->getFormKikakuDownFile());
+            $this->arrHidden = array_merge((array)$this->arrHidden, (array)$this->objDownFile->getHiddenFileList());
+            // Form用に配列を渡す。
+            $this->arrForm = array_merge((array)$this->arrForm, (array)$this->objDownFile->getFormKikakuDownFile());
             // 規格の組み合わせ一覧を表示
             $this->doDisp($product_id,
@@ -185 +185 @@
             $this->arrForm['select_class_id2'] = "";
             $this->doPreEdit($objFormParam->getValue('product_id'), false, true);
-            // Hiddenからのデータを引き継ぐ
-            $this->objDownFile->setHiddenFileList($_POST);
+            // Hiddenからのデータを引き継ぐ
+            $this->objDownFile->setHiddenFileList($_POST);
             // HIDDEN用に配列を渡す。
-            $this->arrHidden = array_merge((array)$this->arrHidden, (array)$this->objDownFile->getHiddenFileList());
-            // Form用に配列を渡す。
-            $this->arrForm = array_merge((array)$this->arrForm, (array)$this->objDownFile->getFormKikakuDownFile());
+            $this->arrHidden = array_merge((array)$this->arrHidden, (array)$this->objDownFile->getHiddenFileList());
+            // Form用に配列を渡す。
+            $this->arrForm = array_merge((array)$this->arrForm, (array)$this->objDownFile->getFormKikakuDownFile());
             $this->doDisp($objFormParam->getValue('product_id'),
                           $objFormParam->getValue('select_class_id1'),
@@ -199 +199 @@
             $this->tpl_mainpage = 'products/product_class_complete.tpl';
             // ファイル情報の初期化
-            // Hiddenからのデータを引き継ぐ
-            $this->objDownFile->setHiddenFileList($_POST);
+            // Hiddenからのデータを引き継ぐ
+            $this->objDownFile->setHiddenFileList($_POST);
             // 商品規格の登録
             $arrList = $objFormParam->getHashArray();
@@ -292 +292 @@
      */
     function initDownFile($count, &$objDownFile) {
-        $i = 1;
+        $i = 1;
         for ($i = 1; $i < $count; $i++) {
             $objDownFile->addFile("ダウンロード販売用ファイル", 'down_realfilename'. ":" . $i, explode(",", DOWNLOAD_EXTENSION), DOWN_SIZE, true, 0, 0);
@@ -336 +336 @@
         }
         $i = 1;
-        while (isset($arrList['check:' . $i])) {
+        while (!SC_Utils_Ex::isBlank($arrList['check:' . $i])) {
             $pVal = array();
             $pVal['product_id'] = $product_id;;