fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 03:32:00 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 1007 fixed that validate check 'find password answer' when adding member on admin.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10319 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-05 09:37:48 +00:00
parent 206ded7cf9
commit 0a8d9c2541
4 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/member/member.admin.view.php
View file

@ -177,7 +177,7 @@
$security->encodeHTML('extend_form_list..');
$security->encodeHTML('extend_form_list..default_value.');
$formTags = $this->_getMemberInputTag($memberInfo);
$formTags = $this->_getMemberInputTag($memberInfo, true);
Context::set('formTags', $formTags);
$member_config = $oMemberModel->getMemberConfig();
@ -189,7 +189,7 @@
$this->setTemplateFile('insert_member');
}
function _getMemberInputTag($memberInfo){
function _getMemberInputTag($memberInfo, $isAdmin = false){
$oMemberModel = &getModel('member');
$extend_form_list = $oMemberModel->getCombineJoinForm($memberInfo);
@ -205,7 +205,14 @@
unset($formTag);
$inputTag = '';
$formTag->title = $formInfo->title;
if ($formInfo->required || $formInfo->mustRequired && $formInfo->name != 'password') $formTag->title = $formTag->title.' <em style="color:red">*</em>';
if($isAdmin)
{
if($formInfo->mustRequired) $formTag->title = $formTag->title.' <em style="color:red">*</em>';
}
else
{
if ($formInfo->required && $formInfo->name != 'password') $formTag->title = $formTag->title.' <em style="color:red">*</em>';
}
$formTag->name = $formInfo->name;
if($formInfo->isDefaultForm){

2
modules/member/ruleset/insertAdminMember.xml
View file

@ -9,5 +9,7 @@
<if test="!$member_srl" attr="length" value="3:20" />
</field>
<field name="nick_name" required="true" />
<field name="find_account_question" required="true" />
<field name="find_account_answer" required="true" length=":250" />
</fields>
</ruleset>

2
modules/member/tpl/insert_member.html
View file

@ -9,7 +9,7 @@
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form action="./" class="form" ruleset="@insertMember" method="post" enctype="multipart/form-data">
<form action="./" class="form" ruleset="insertAdminMember" method="post" enctype="multipart/form-data">
<input type="hidden" name="module" value="member" />
<input type="hidden" name="act" value="procMemberAdminInsert" />
<input type="hidden" name="member_srl" value="{$member_srl}" />

8
modules/member/tpl/member_config.html
View file

@ -130,7 +130,7 @@
</th>
<td><input type="radio" name="identifier" value="{$item->name}" checked="checked" /></td>
<td><input type="checkbox" name="usable_list[]" value="{$item->name}" title="{$lang->use}" checked="checked" disabled="disabled" /></td>
<td>
<td class="nowr">
<input type="radio" id="{$item->name}_re" name="{$item->name}" value="requierd" checked="checked" disabled="disabled" /> <label for="{$item->name}_re">{$lang->cmd_required}</label>
<input type="radio" id="{$item->name}_op" name="{$item->name}" value="option" disabled="disabled" /> <label for="{$item->name}_op">{$lang->cmd_optional}</label>
</td>
@ -150,7 +150,7 @@
</th>
<td><input type="radio" name="identifier" value="{$item->name}" cond="$item->name== 'email_address' || $item->name=='user_id'" /></td>
<td><input type="checkbox" name="usable_list[]" value="{$item->name}" title="{$lang->use}" checked="checked"|cond="$item->mustRequired || $item->isUse" disabled="disabled"|cond="$item->mustRequired" /></td>
<td>
<td class="nowr">
<input type="radio" id="{$item->name}_re" name="{$item->name}" value="required" checked="checked"|cond="$item->mustRequired || $item->required" disabled="disabled"|cond="$item->mustRequired || !$item->isUse" /> <label for="{$item->name}_re">{$lang->cmd_required}</label>
<input type="radio" id="{$item->name}_op" name="{$item->name}" value="option" checked="checked"|cond="!$item->mustRequired && ($item->isUse && !$item->required)" disabled="disabled"|cond="$item->mustRequired || !$item->isUse" /> <label for="{$item->name}_op">{$lang->cmd_optional}</label>
<div cond="$item->imageType" class="_subItem">
@ -174,12 +174,12 @@
</th>
<td></td>
<td><input type="checkbox" name="usable_list[]" value="{$item->name}" title="{$lang->use}" checked="checked"|cond="$item->isUse" /></td>
<td>
<td class="nowr">
<input type="radio" id="{$item->name}_re" name="{$item->name}" value="required" checked="checked"|cond="$item->required" disabled="disabled"|cond="!$item->isUse"/> <label for="{$item->name}_re">{$lang->cmd_required}</label>
<input type="radio" id="{$item->name}_op" name="{$item->name}" value="option" checked="checked"|cond="$item->isUse && !$item->required" disabled="disabled"|cond="!$item->isUse" /> <label for="{$item->name}_op">{$lang->cmd_optional}</label>
</td>
<td class="text">{$item->description}</td>
<td id="{$item->member_join_form_srl}"><a href="#userDefine" class="modalAnchor _extendFormEdit">{$lang->cmd_edit}</a> | <a href="#" class="_extendFormDelete">{$lang->cmd_delete}</a></td>
<td id="{$item->member_join_form_srl}" class="nowr"><a href="#userDefine" class="modalAnchor _extendFormEdit">{$lang->cmd_edit}</a> | <a href="#" class="_extendFormDelete">{$lang->cmd_delete}</a></td>
</tr>
<!--@end-->
<!--@end-->