From 67de03927fc000968abe1f56304d7e6cb0636d9c Mon Sep 17 00:00:00 2001
From: devjin <namnyams@gmail.com>
Date: Thu, 8 Mar 2012 05:32:21 +0000
Subject: [PATCH] issue 1242 modified member list in point module

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10384 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/point/point.admin.view.php | 7 ++++++-
 modules/point/tpl/member_list.html | 7 +++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/point/point.admin.view.php b/modules/point/point.admin.view.php
index db6d252f5..653c40bea 100644
--- a/modules/point/point.admin.view.php
+++ b/modules/point/point.admin.view.php
@@ -88,7 +88,12 @@
             $args->list_count = 20;
             $args->page = Context::get('page');
 
-			$columnList = array('member.member_srl', 'member.user_id', 'member.user_name', 'member.nick_name', 'point.point');
+			$oMemberModel = &getModel('member');
+			$memberConfig = $oMemberModel->getMemberConfig();
+
+			Context::set('identifier', $memberConfig->identifier);
+
+			$columnList = array('member.member_srl', 'member.user_id', 'member.email_address', 'member.nick_name', 'point.point');
             $output = $oPointModel->getMemberList($args, $columnList);
             // context::set for writing into a template 
             Context::set('total_count', $output->total_count);
diff --git a/modules/point/tpl/member_list.html b/modules/point/tpl/member_list.html
index 8eff21c58..6f84db511 100644
--- a/modules/point/tpl/member_list.html
+++ b/modules/point/tpl/member_list.html
@@ -10,8 +10,7 @@
 		<thead>
 			<tr>
 				<th scope="col">{$lang->no}</th>
-				<th scope="col">{$lang->user_id}</th>
-				<th scope="col">{$lang->user_name}</th>
+				<th scope="col">{Context::getLang($identifier)}</th>
 				<th scope="col">{$lang->nick_name}</th>
 				<th scope="col">{$lang->point}</th>
 				<th scope="col">{$lang->level}</th>
@@ -21,8 +20,8 @@
 			<!--@foreach($member_list as $no => $val)-->
 			<tr>
 				<td>{$no}</td>
-				<td>{$val->user_id}</td>
-				<td>{$val->user_name}</td>
+				<td cond="$identifier == 'user_id'">{$val->user_id}</td>
+				<td cond="$identifier != 'user_id'">{$val->email_address}</td>
 				<td><a href="#popup_menu_area" class="member_{$val->member_srl}">{$val->nick_name}</a></td>
 				<td>
 					<form action="./" method="get">