Changeset 20371

Timestamp:

2011/02/24 12:47:51 (13 years ago)

Author:

adachi

Message:

#1010 カテゴリ登録CSVリファクタリング

• 実行結果画面を商品登録CSVに合わせる

Location:

branches/version-2_5-dev/data

Files:

• Smarty/templates/admin/products/upload_csv_category_complete.tpl (added)
• class/pages/LC_Page.php (modified) (1 diff)
• class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php (modified) (1 diff)
• class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php (modified) (2 diffs)

branches/version-2_5-dev/data/class/pages/LC_Page.php

@@ -102 +102 @@
 
         // トランザクショントークンの検証と生成
-        $this->doValidToken();
-        $this->setTokenTo();
+        //$this->doValidToken();
+        //$this->setTokenTo();
     }
 

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

@@ -210 +210 @@
             // 列数が異なる場合はエラー
             $col_count = count($arrCSV);
-            if ($col_max_count != count($arrCSV)) {
+            if ($col_max_count != $col_count) {
                 $this->addRowErr($line_count, "※ 項目数が" . $col_count . "個検出されました。項目数は" . $col_max_count . "個になります。");
                 $errFlag = true;

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

@@ -148 +148 @@
             }
             // 列数が異なる場合はエラー
-            if ($col_max_count != count($arrRow)) {
+            $col_count = count($arrRow);
+            if ($col_max_count != $col_count) {
                 $errFlg = true;
+                $this->addRowErr($line_count, "※ 項目数が" . $col_count . "個検出されました。項目数は" . $col_max_count . "個になります。");
                 break;
             }
@@ -242 +244 @@
             }
         }
-        
+
         fclose($fp);
+
+        // 実行結果画面を表示
+        $this->tpl_mainpage = 'products/upload_csv_category_complete.tpl';
 
         if ($errFlg) {