Changeset 20690

Timestamp:

2011/03/17 20:41:27 (12 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20110317105646-y50cylhoroipslk8

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/admin/customer/edit_confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fcustomer%2Fedit_confirm.tpl
data/class/helper/SC_Helper_Customer.php 19864@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2Fclass%2Fhelper%2FSC_Helper_Customer.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110317114037-jeqhutlcba8fl3om

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110317114124-8hxa4fgbwcsoblea

bzr:revno:

3408

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/admin/customer/edit_confirm.tpl ohkouchi@loop-az.jp-20110317114037-jeqhutlcba8fl3om

bzr:timestamp:

2011-03-17 20:41:24.183000088 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-03-17T11:41:24.183000Z

Message:

#1076 ([管理画面]顧客登録の文字チェック不具合)

• パスワードと質問の答えを必須チェックに修正

Location:

branches/version-2_5-dev/data

Files:

• Smarty/templates/admin/customer/edit_confirm.tpl (modified) (2 diffs)
• class/helper/SC_Helper_Customer.php (modified) (2 diffs)

branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit_confirm.tpl

@@ -114 +114 @@
             <tr>
                 <th>パスワード<span class="attention"> *</span></th>
-                <td><!--{$arrForm.password|h}--></td>
+                <td><!--{$smarty.const.DEFAULT_PASSWORD}--></td>
             </tr>
             <tr>
@@ -120 +120 @@
                 <td>
                     質問： <!--{$arrReminder[$arrForm.reminder]|h}--><br />
-                    答え： <!--{$arrForm.reminder_answer|h}-->
+                    答え： <!--{$smarty.const.DEFAULT_PASSWORD}-->
                 </td>
             </tr>

branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php

@@ -356 +356 @@
      */
     function sfCustomerRegisterParam (&$objFormParam, $isAdmin = false) {
-        if($isAdmin) {
-            $objFormParam->addParam("パスワード", 'password', STEXT_LEN, 'a', array("SPTAB_CHECK", "ALNUM_CHECK", "MAX_LENGTH_CHECK"));
-            $objFormParam->addParam("パスワード確認用の質問の答え", "reminder_answer", STEXT_LEN, 'aKV', array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
-        }else{
-            $objFormParam->addParam("パスワード", 'password', STEXT_LEN, 'a', array("EXIST_CHECK", "SPTAB_CHECK", "ALNUM_CHECK", "MAX_LENGTH_CHECK"));
-            $objFormParam->addParam("パスワード確認用の質問の答え", "reminder_answer", STEXT_LEN, 'aKV', array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
-        }
+        $objFormParam->addParam("パスワード", 'password', STEXT_LEN, 'a', array("EXIST_CHECK", "SPTAB_CHECK", "ALNUM_CHECK", "MAX_LENGTH_CHECK"));
+        $objFormParam->addParam("パスワード確認用の質問の答え", "reminder_answer", STEXT_LEN, 'aKV', array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
         $objFormParam->addParam("パスワード確認用の質問", 'reminder', STEXT_LEN, 'n', array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
         $objFormParam->addParam("性別", 'sex', INT_LEN, 'n', array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
@@ -429 +424 @@
         $objErr = SC_Helper_Customer_Ex::sfCustomerRegisterErrorCheck($objErr, $isAdmin);
 
-        if ((isset($objErr->arrErr['password'])
-                && $objFormParam->getValue('password') == DEFAULT_PASSWORD)
-              or $isAdmin) {
+        if (isset($objErr->arrErr['password'])
+             && $objFormParam->getValue('password') == DEFAULT_PASSWORD) {
             unset($objErr->arrErr['password']);
             unset($objErr->arrErr['password02']);
         }
-        if ((isset($objErr->arrErr['reminder_answer'])
-                && $objFormParam->getValue('reminder_answer') == DEFAULT_PASSWORD)
-              or $isAdmin) {
+        if (isset($objErr->arrErr['reminder_answer'])
+                && $objFormParam->getValue('reminder_answer') == DEFAULT_PASSWORD) {
             unset($objErr->arrErr['reminder_answer']);
         }