Changeset 20183

Timestamp:

2011/02/17 21:10:06 (13 years ago)

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/admin/order/edit.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fedit.tpl
data/class/pages/LC_Page_InputZip.php 16174@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2FLC_Page_InputZip.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110217120802-y82x9d6ukjrtwr6q

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110217120955-cfibevqb9ghrmg96

bzr:revno:

2911

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/admin/order/edit.tpl ohkouchi@loop-az.jp-20110217120802-y82x9d6ukjrtwr6q
data/class/pages/LC_Page_InputZip.php ohkouchi@loop-az.jp-20110217120802-y82x9d6ukjrtwr6q

bzr:timestamp:

2011-02-17 21:09:55.993999958 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-17T12:09:55.994000Z

Message:

#975([管理画面]受注管理（受注一覧、登録編集）)

• 住所自動入力が動作していなかったのを修正

#642(共通ロジックの機能向上)

• 住所自動入力を, 配列のフォームに対応

Location:

branches/version-2_5-dev/data

Files:

• Smarty/templates/admin/order/edit.tpl (modified) (1 diff)
• class/pages/LC_Page_InputZip.php (modified) (1 diff)

branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl

@@ -481 +481 @@
                  -
                 <input type="text" name="<!--{$key2}-->[<!--{$shipping_index}-->]" value="<!--{$arrForm[$key2].value[$shipping_index]|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2][$shipping_index]|sfGetErrorColor}-->" size="6" class="box6" />
-                <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'shipping_zip01', 'shipping_zip02', 'shipping_pref', 'shipping_addr01'); return false;">住所入力</a><br />
+                <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'shipping_zip01[<!--{$shipping_index}-->]', 'shipping_zip02[<!--{$shipping_index}-->]', 'shipping_pref[<!--{$shipping_index}-->]', 'shipping_addr01[<!--{$shipping_index}-->]'); return false;">住所入力</a><br />
                 <!--{assign var=key value="shipping_pref"}-->
                 <span class="attention"><!--{$arrErr[$key][$shipping_index]}--></span>

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

@@ -130 +130 @@
      */
     function lfInputNameCheck($value) {
-        // 半角英数字と_（アンダーバー）以外の文字を使用していたらエラー
-        if(strlen($value) > 0 && !preg_match("/^[a-zA-Z0-9_]+$/", $value)) {
+        // 半角英数字と_（アンダーバー）, []以外の文字を使用していたらエラー
+        if(strlen($value) > 0 && !preg_match("/^[a-zA-Z0-9_\[\]]+$/", $value)) {
             return false;
         }