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

issue 420, fixed can not register module admin when using email address for member identifier

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9608 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-10-12 08:12:23 +00:00
parent db0d62ed4a
commit 4ac1dca4a4
4 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/module/module.admin.model.php
View file

@ -55,6 +55,11 @@
* Available when using module instance in all the modules
**/
function getModuleGrantHTML($module_srl, $source_grant_list) {
// get member module's config
$oMemberModel = &getModel('member');
$member_config = $oMemberModel->getMemberConfig();
Context::set('member_config', $member_config);
$oModuleModel = &getModel('module');
$columnList = array('module_srl', 'site_srl');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);

8
modules/module/module.controller.php
View file

@ -537,7 +537,13 @@
**/
function insertAdminId($module_srl, $admin_id) {
$oMemberModel = &getModel('member');
$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
$member_config = $oMemberModel->getMemberConfig();
if ($member_config->identifier == 'email_address')
$member_info = $oMemberModel->getMemberInfoByEmailAddress($admin_id);
else
$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
if(!$member_info->member_srl) return;
$args->module_srl = $module_srl;
$args->member_srl = $member_info->member_srl;

10
modules/module/tpl/module_grants.html
View file

@ -13,11 +13,17 @@
<div class="table">
<table width="100%" border="1" cellspacing="0">
<tr>
<th scope="row" rowspan="2">{$lang->admin_id}</th>
<th scope="row" rowspan="2">
<!--@if($member_config->identifier == 'email_address')-->
{$lang->admin_email_address}
<!--@else-->
{$lang->admin_id}
<!--@end-->
</th>
<td >
<select name="_admin_member" multiple="multiple" size="{count($admin_member)?count($admin_member):1}" class="w200">
<!--@foreach($admin_member as $key => $val)-->
<option value="{$val->user_id}">{$val->nick_name} ({$val->user_id})</option>
<option value="{$val->user_id}">{$val->nick_name} (<!--@if($member_config->identifier=='email_address')-->{$val->email_address}<!--@else-->{$val->user_id}<!--@end-->)</option>
<!--@end-->
</select>
</td>