Changeset 21263 for branches/version-2_11-dev/data/class/SC_Product.php

Timestamp:

2011/09/28 16:15:05 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20110927064627-pbpra1leljc2ayhj

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/SC_Product.php 18277@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2FSC_Product.php
html/js/products.js products.js-20110223205405-tr2pdhnwxtjiqrzr-1

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110928071415-kubjzfqsb60mc40u

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110928071457-fjo42gyahu97a15l

bzr:revno:

3961

bzr:revprop:branch-nick:

branches/version-2_11-dev

bzr:root:

branches/version-2_11-dev

bzr:testament:

bazaar-ng testament short form 2.1
revision-id: ohkouchi@loop-az.jp-20110928071457-fjo42gyahu97a15l
sha1: 487ecaba3c278e48f1fdedb8a7f656ec7c301670

bzr:text-parents:

data/class/SC_Product.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21256
html/js/products.js ohkouchi@loop-az.jp-20110322110044-2t19e6g3xd4f702t

bzr:timestamp:

2011-09-28 16:14:57.710999966 +0900

bzr:user-agent:

bzr2.4.1+bzr-svn1.1.0

Message:

#1280 (PECL json 使用時, 規格2のプルダウンが表示されない)

• 空のキーが生成されないよう修正

File:

• branches/version-2_11-dev/data/class/SC_Product.php (modified) (1 diff)

branches/version-2_11-dev/data/class/SC_Product.php

@@ -309 +309 @@
 
                 // #929(GC8 規格のプルダウン順序表示不具合)対応のため、2次キーは「#」を前置
+                if (SC_Utils_Ex::isBlank($productsClass1)) {
+                    $productsClass1 = '__unselected2';
+                }
                 $classCategories[$productsClass1]['#'] = array(
                     'classcategory_id2' => '',