- Timestamp:
- 2012/02/03 11:15:06 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_12-dev/patches/no_tree.patch
r21418 r21434 1 Index: data/class/helper/SC_Helper_DB.php 2 =================================================================== 3 --- data/class/helper/SC_Helper_DB.php (revision 21433) 4 +++ data/class/helper/SC_Helper_DB.php (working copy) 5 @@ -1437,7 +1437,7 @@ 6 if (!SC_Utils_Ex::sfIsInt($product_id)) return false; 7 8 $objQuery =& SC_Query_Ex::getSingletonInstance(); 9 - $where = 'product_id = ? AND del_flg = 0 AND class_combination_id IS NOT NULL'; 10 + $where = 'product_id = ? AND del_flg = 0 AND classcategory_id1 != 0 AND classcategory_id2 != 0'; 11 $exists = $objQuery->exists('dtb_products_class', $where, array($product_id)); 12 13 return $exists; 1 14 Index: data/class/pages/admin/products/LC_Page_Admin_Products_Product.php 2 15 =================================================================== 3 --- data/class/pages/admin/products/LC_Page_Admin_Products_Product.php (revision 214 17)16 --- data/class/pages/admin/products/LC_Page_Admin_Products_Product.php (revision 21433) 4 17 +++ data/class/pages/admin/products/LC_Page_Admin_Products_Product.php (working copy) 5 18 @@ -1048,32 +1048,14 @@ … … 158 171 Index: data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 159 172 =================================================================== 160 --- data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php (revision 214 17)173 --- data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php (revision 21433) 161 174 +++ data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php (working copy) 162 175 @@ -236,16 +236,18 @@ … … 286 299 Index: data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php 287 300 =================================================================== 288 --- data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php (revision 214 17)301 --- data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php (revision 21433) 289 302 +++ data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php (working copy) 290 @@ -61 2,6 +612,7 @@303 @@ -613,6 +613,7 @@ 291 304 */ 292 305 function lfCheckErrorDetail($item, $arrErr) { … … 296 309 $arrErr['product_class_id'] = "※ 指定の商品規格IDは、登録されていません。"; 297 310 } 298 @@ -62 7,17 +628,6 @@311 @@ -628,17 +629,6 @@ 299 312 } 300 313 } … … 316 329 Index: data/class/SC_Product.php 317 330 =================================================================== 318 --- data/class/SC_Product.php (revision 214 17)331 --- data/class/SC_Product.php (revision 21433) 319 332 +++ data/class/SC_Product.php (working copy) 320 @@ -2 68,9 +268,9 @@333 @@ -258,9 +258,9 @@ 321 334 : ''; 322 335 … … 330 343 $this->stock_find[$productId] = false; 331 344 $classCategories = array(); 332 @@ -3 25,7 +325,7 @@345 @@ -315,7 +315,7 @@ 333 346 $classCats2['product_type'] = $productsClass['product_type_id']; 334 347 … … 339 352 } 340 353 $classCategories[$productsClass1]['#'] = array( 341 @@ -3 65,86 +365,33 @@354 @@ -355,86 +355,33 @@ 342 355 T1.product_type_id, 343 356 T1.down_filename, … … 442 455 443 456 /** 444 @@ -7 98,7 +745,7 @@457 @@ -788,7 +735,7 @@ 445 458 ( 446 459 SELECT dtb_products.*, … … 451 464 dtb_products_class.product_code, 452 465 dtb_products_class.stock, 453 @@ -8 10,11 +757,13 @@466 @@ -800,11 +747,13 @@ 454 467 dtb_products_class.point_rate, 455 468 dtb_products_class.down_filename, … … 470 483 Tcc1.name as classcategory_name, 471 484 Tcc2.class_id as parent_class_id, 472 @@ -8 22,14 +771,10 @@485 @@ -812,14 +761,10 @@ 473 486 FROM dtb_products 474 487 LEFT JOIN dtb_products_class … … 489 502 Index: html/install/index.php 490 503 =================================================================== 491 --- html/install/index.php (revision 214 17)504 --- html/install/index.php (revision 21430) 492 505 +++ html/install/index.php (working copy) 493 506 @@ -1053,7 +1053,6 @@ … … 501 514 Index: html/install/sql/create_table_mysql.sql 502 515 =================================================================== 503 --- html/install/sql/create_table_mysql.sql (revision 214 17)516 --- html/install/sql/create_table_mysql.sql (revision 21430) 504 517 +++ html/install/sql/create_table_mysql.sql (working copy) 505 518 @@ -315,7 +315,8 @@ … … 530 543 Index: html/install/sql/create_table_pgsql.sql 531 544 =================================================================== 532 --- html/install/sql/create_table_pgsql.sql (revision 214 17)545 --- html/install/sql/create_table_pgsql.sql (revision 21430) 533 546 +++ html/install/sql/create_table_pgsql.sql (working copy) 534 547 @@ -315,7 +315,8 @@ … … 559 572 Index: html/install/sql/drop_table.sql 560 573 =================================================================== 561 --- html/install/sql/drop_table.sql (revision 214 17)574 --- html/install/sql/drop_table.sql (revision 21430) 562 575 +++ html/install/sql/drop_table.sql (working copy) 563 576 @@ -15,7 +15,6 @@ … … 571 584 Index: html/install/sql/insert_data.sql 572 585 =================================================================== 573 --- html/install/sql/insert_data.sql (revision 214 17)586 --- html/install/sql/insert_data.sql (revision 21430) 574 587 +++ html/install/sql/insert_data.sql (working copy) 575 588 @@ -236,8 +236,6 @@ … … 644 657 Index: test/createEcCubeData-v25.php 645 658 =================================================================== 646 --- test/createEcCubeData-v25.php (revision 214 17)659 --- test/createEcCubeData-v25.php (revision 21430) 647 660 +++ test/createEcCubeData-v25.php (working copy) 648 661 @@ -57,7 +57,7 @@
Note: See TracChangeset
for help on using the changeset viewer.