Changeset 20760

Timestamp:

2011/03/22 12:37:58 (12 years ago)

Author:

nanasess

bzr:base-revision:

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

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-20110322033705-ctufnfzs72abavx2

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110322033748-5yxzaoeg3zt9tsdi

bzr:revno:

3474

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-20110322033705-ctufnfzs72abavx2

bzr:timestamp:

2011-03-22 12:37:48.986999989 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-03-22T03:37:48.987000Z

Message:

#1188 (規格の変更を重ねるとデータがおかしくなる)

• 新たに規格分類を追加した場合に対応

File:

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

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

@@ -475 +475 @@
         $existsProductsClass = $objProduct->getProductsClassFullByProductId($product_id, true);
 
+        // 規格のデフォルト値(すべての組み合わせ)を取得し, フォームに反映
         $class_id1 = $existsProductsClass[0]['class_id1'];
         $class_id2 = $existsProductsClass[0]['class_id2'];
@@ -481 +482 @@
         $this->doDisp($objFormParam);
 
+        /*-------------------------------------------------------------
+         * 登録済みのデータで, フォームの値を上書きする.
+         *
+         * 登録済みデータと, フォームの値は, 配列の形式が違うため,
+         * 同じ形式の配列を生成し, マージしてフォームの値を上書きする
+         --------------------------------------------------------------*/
+        $arrKeys = array('classcategory_id1', 'classcategory_id2','product_code',
+                         'classcategory_name1', 'classcategory_name2', 'stock',
+                         'stock_unlimited', 'price01', 'price02',
+                         'product_type_id', 'down_filename', 'down_realfilename',
+                         'upload_index');
+        $arrFormValues = $objFormParam->getSwapArray($arrKeys);
+        // フォームの規格1, 規格2をキーにした配列を生成
+        $arrClassCatKey = array();
+        foreach ($arrFormValues as $formValue) {
+            $arrClassCatKey[$formValue['classcategory_id1']][$formValue['classcategory_id2']] = $formValue;
+        }
+        // 登録済みデータをマージ
+        foreach ($existsProductsClass as $existsValue) {
+            $arrClassCatKey[$existsValue['classcategory_id1']][$existsValue['classcategory_id2']] = $existsValue;
+        }
+
+        // 規格のデフォルト値に del_flg をつけてマージ後の1次元配列を生成
+        $arrMergeProductsClass = array();
+        foreach ($arrClassCatKey as $arrC1) {
+            foreach ($arrC1 as $arrValues) {
+                $arrValues['del_flg'] = (string) $arrValues['del_flg'];
+                if (SC_Utils_Ex::isBlank($arrValues['del_flg'])
+                    || $arrValues['del_flg'] === '1') {
+                    $arrValues['del_flg'] = '1';
+                } else {
+                    $arrValues['del_flg'] = '0';
+                }
+                $arrMergeProductsClass[] = $arrValues;
+            }
+        }
+
         // 登録済みのデータで上書き
-        $objFormParam->setParam(SC_Utils_Ex::sfSwapArray($existsProductsClass));
-
-        // $existsProductsClass で product_id が配列になってしまうため数値で上書き
+        $objFormParam->setParam(SC_Utils_Ex::sfSwapArray($arrMergeProductsClass));
+
+        // $arrMergeProductsClass で product_id が配列になってしまうため数値で上書き
         $objFormParam->setValue('product_id', $product_id);
 
@@ -491 +529 @@
         $index = 0;
         foreach ($objFormParam->getValue('del_flg') as $key => $val) {
-            if ($val == 0) {
+            if ($val === '0') {
                 $arrChecks[$index] = 1;
             }