Changeset 17579 for branches/comu-ver2/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php

Timestamp:

2008/08/29 00:10:25 (16 years ago)

Author:

Seasoft

Message:

merge r17463,r17464,r17465,r17468,r17472,r17473,r17493,r17497,r17500,r17501,r17504

File:

• branches/comu-ver2/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php (modified) (6 diffs)

branches/comu-ver2/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php

@@ -97 +97 @@
         $this->objUpFile->setHiddenFileList($_POST);
 
+        // 規格の有り無し判定
+        $this->tpl_nonclass = $this->lfCheckNonClass($_POST['product_id']);
+
         // 検索パラメータの引き継ぎ
         foreach ($_POST as $key => $val) {
@@ -140 +143 @@
                 $this->arrRecommend = $this->lfPreGetRecommendProducts($_POST['product_id']);
 
-                // 規格登録ありなし判定
-                $this->tpl_nonclass = $this->lfCheckNonClass($_POST['product_id']);
                 $this->lfProductPage();     // 商品登録ページ
             }
@@ -147 +148 @@
         // 商品登録・編集
         case 'edit':
-            // 規格登録ありなし判定
-            $tpl_nonclass = $this->lfCheckNonClass($_POST['product_id']);
-
             if($_POST['product_id'] == "" and SC_Utils_Ex::sfIsInt($_POST['copy_product_id'])){
-                $tpl_nonclass = $this->lfCheckNonClass($_POST['copy_product_id']);
-            }
-            $this->tpl_nonclass = $tpl_nonclass;
+                $this->tpl_nonclass = $this->lfCheckNonClass($_POST['copy_product_id']);
+            }
 
             // 入力値の変換
@@ -200 +197 @@
         // 確認ページからの戻り
         case 'confirm_return':
-            // 規格登録ありなし判定
-            $this->tpl_nonclass = $this->lfCheckNonClass($_POST['product_id']);
             $this->lfProductPage();     // 商品登録ページ
             break;
@@ -442 +437 @@
                 $sqlval['product_id'] = $product_id;
             }
-            
+
             // INSERTの実行
             $sqlval['create_date'] = "Now()";
             $objQuery->insert("dtb_products", $sqlval);
-            
+
             // product_id 取得（MySQLの場合）
             if(DB_TYPE=='mysql'){
                 $product_id = $objQuery->nextval("dtb_products", "product_id");
             }
-            
+
             // カテゴリを更新
             $objDb->updateProductCategories($arrList['category_id'], $product_id);
@@ -694 +689 @@
             if($forced) $this->objUpFile->save_file[$arrImageKey[$to_key]] = "";
 
-            if(empty($this->objUpFile->temp_file[$arrImageKey[$to_key]]) && 
+            if(empty($this->objUpFile->temp_file[$arrImageKey[$to_key]]) &&
                empty($this->objUpFile->save_file[$arrImageKey[$to_key]])) {