Changeset 20690


Ignore:
Timestamp:
2011/03/17 20:41:27 (10 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit_confirm.tpl

    r20532 r20690  
    114114            <tr> 
    115115                <th>パスワード<span class="attention"> *</span></th> 
    116                 <td><!--{$arrForm.password|h}--></td> 
     116                <td><!--{$smarty.const.DEFAULT_PASSWORD}--></td> 
    117117            </tr> 
    118118            <tr> 
     
    120120                <td> 
    121121                    質問: <!--{$arrReminder[$arrForm.reminder]|h}--><br /> 
    122                     答え: <!--{$arrForm.reminder_answer|h}--> 
     122                    答え: <!--{$smarty.const.DEFAULT_PASSWORD}--> 
    123123                </td> 
    124124            </tr> 
  • branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php

    r20541 r20690  
    356356     */ 
    357357    function sfCustomerRegisterParam (&$objFormParam, $isAdmin = false) { 
    358         if($isAdmin) { 
    359             $objFormParam->addParam("パスワード", 'password', STEXT_LEN, 'a', array("SPTAB_CHECK", "ALNUM_CHECK", "MAX_LENGTH_CHECK")); 
    360             $objFormParam->addParam("パスワード確認用の質問の答え", "reminder_answer", STEXT_LEN, 'aKV', array("SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
    361         }else{ 
    362             $objFormParam->addParam("パスワード", 'password', STEXT_LEN, 'a', array("EXIST_CHECK", "SPTAB_CHECK", "ALNUM_CHECK", "MAX_LENGTH_CHECK")); 
    363             $objFormParam->addParam("パスワード確認用の質問の答え", "reminder_answer", STEXT_LEN, 'aKV', array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
    364         } 
     358        $objFormParam->addParam("パスワード", 'password', STEXT_LEN, 'a', array("EXIST_CHECK", "SPTAB_CHECK", "ALNUM_CHECK", "MAX_LENGTH_CHECK")); 
     359        $objFormParam->addParam("パスワード確認用の質問の答え", "reminder_answer", STEXT_LEN, 'aKV', array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
    365360        $objFormParam->addParam("パスワード確認用の質問", 'reminder', STEXT_LEN, 'n', array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK")); 
    366361        $objFormParam->addParam("性別", 'sex', INT_LEN, 'n', array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK")); 
     
    429424        $objErr = SC_Helper_Customer_Ex::sfCustomerRegisterErrorCheck($objErr, $isAdmin); 
    430425 
    431         if ((isset($objErr->arrErr['password']) 
    432                 && $objFormParam->getValue('password') == DEFAULT_PASSWORD) 
    433               or $isAdmin) { 
     426        if (isset($objErr->arrErr['password']) 
     427             && $objFormParam->getValue('password') == DEFAULT_PASSWORD) { 
    434428            unset($objErr->arrErr['password']); 
    435429            unset($objErr->arrErr['password02']); 
    436430        } 
    437         if ((isset($objErr->arrErr['reminder_answer']) 
    438                 && $objFormParam->getValue('reminder_answer') == DEFAULT_PASSWORD) 
    439               or $isAdmin) { 
     431        if (isset($objErr->arrErr['reminder_answer']) 
     432                && $objFormParam->getValue('reminder_answer') == DEFAULT_PASSWORD) { 
    440433            unset($objErr->arrErr['reminder_answer']); 
    441434        } 
Note: See TracChangeset for help on using the changeset viewer.