mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-04 01:01:41 +09:00
Merge pull request #742 from bjrambo/pr/fix-ncenterlite
알림센터의 관리자 로그에서 회원정보 가져오는 로직 개선.
This commit is contained in:
commit
e810e35095
3 changed files with 13 additions and 22 deletions
|
|
@ -2,36 +2,33 @@
|
|||
|
||||
class ncenterliteAdminModel extends ncenterlite
|
||||
{
|
||||
|
||||
function getAdminNotifyList($member_srl=null, $page=1, $readed='N')
|
||||
function getAdminNotifyList()
|
||||
{
|
||||
$oNcenterliteModel = getModel('ncenterlite');
|
||||
$config = $oNcenterliteModel->getConfig();
|
||||
|
||||
global $lang;
|
||||
|
||||
$act = Context::get('act');
|
||||
$output = $oNcenterliteModel->getNcenterliteAdminList();
|
||||
|
||||
$oMemberModel = getModel('member');
|
||||
$list = $output->data;
|
||||
|
||||
foreach($list as $k => $v)
|
||||
foreach($list as $key => $value)
|
||||
{
|
||||
$v->text = $oNcenterliteModel->getNotificationText($v);
|
||||
$v->ago = $oNcenterliteModel->getAgo($v->regdate);
|
||||
$v->url = getUrl('','act','procNcenterliteRedirect', 'notify', $v->notify, 'url', $v->target_url);
|
||||
if($v->target_member_srl)
|
||||
$value->text = $oNcenterliteModel->getNotificationText($value);
|
||||
$value->ago = $oNcenterliteModel->getAgo($value->regdate);
|
||||
$value->url = getUrl('','act','procNcenterliteRedirect', 'notify', $value->notify, 'url', $value->target_url);
|
||||
if($value->target_member_srl)
|
||||
{
|
||||
$profileImage = $oMemberModel->getProfileImage($v->target_member_srl);
|
||||
$v->profileImage = $profileImage->src;
|
||||
$profileImage = $oMemberModel->getProfileImage($value->target_member_srl);
|
||||
$value->profileImage = $profileImage->src;
|
||||
}
|
||||
|
||||
$list[$k] = $v;
|
||||
$list[$key] = $value;
|
||||
$member_info = $oMemberModel->getMemberInfoByMemberSrl($value->member_srl);
|
||||
|
||||
$list[$key]->nick_name = $member_info->nick_name;
|
||||
}
|
||||
|
||||
$output->data = $list;
|
||||
return $output;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,8 +105,6 @@ class ncenterliteAdminView extends ncenterlite
|
|||
Context::set('page', $output->page);
|
||||
Context::set('ncenterlite_list', $output->data);
|
||||
Context::set('page_navigation', $output->page_navigation);
|
||||
|
||||
$this->setTemplateFile('ncenter_list');
|
||||
}
|
||||
|
||||
function dispNcenterliteAdminTest()
|
||||
|
|
|
|||
|
|
@ -31,13 +31,9 @@
|
|||
</thead>
|
||||
<tbody>
|
||||
<!--@foreach($ncenterlite_list as $no => $val)-->
|
||||
{@
|
||||
$oMemberModel = getModel('member');
|
||||
$member_info = $oMemberModel->getMemberInfoByMemberSrl($val->member_srl);
|
||||
}
|
||||
<tr>
|
||||
<td>{$val->target_nick_name}</td>
|
||||
<td cond="$member_info->member_srl">{$member_info->nick_name}</td> <td cond="!$member_info->member_srl">타겟없음</td>
|
||||
<td cond="$val->member_srl">{$val->nick_name}</td>
|
||||
<td><a href="{$val->target_url}">{$val->text}</a></td>
|
||||
<td>
|
||||
<span cond="$val->readed == 'Y'" style="color:#8582E6">{$lang->ncenterlite_read_y}</span>
|
||||
Loading…
Add table
Add a link
Reference in a new issue