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

Merge pull request #742 from bjrambo/pr/fix-ncenterlite

Browse source 
알림센터의 관리자 로그에서 회원정보 가져오는 로직 개선.
This commit is contained in:
BJRambo 2017-03-06 16:16:09 +09:00 • committed by GitHub
commit e810e35095
3 changed files with 13 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

27
modules/ncenterlite/ncenterlite.admin.model.php
View file

@ -2,36 +2,33 @@
class ncenterliteAdminModel extends ncenterlite class ncenterliteAdminModel extends ncenterlite
{ {
function getAdminNotifyList()
function getAdminNotifyList($member_srl=null, $page=1, $readed='N')
{ {
$oNcenterliteModel = getModel('ncenterlite'); $oNcenterliteModel = getModel('ncenterlite');
$config = $oNcenterliteModel->getConfig();
global $lang;
$act = Context::get('act');
$output = $oNcenterliteModel->getNcenterliteAdminList(); $output = $oNcenterliteModel->getNcenterliteAdminList();
$oMemberModel = getModel('member'); $oMemberModel = getModel('member');
$list = $output->data; $list = $output->data;
foreach($list as $k => $v) foreach($list as $key => $value)
{ {
$v->text = $oNcenterliteModel->getNotificationText($v); $value->text = $oNcenterliteModel->getNotificationText($value);
$v->ago = $oNcenterliteModel->getAgo($v->regdate); $value->ago = $oNcenterliteModel->getAgo($value->regdate);
$v->url = getUrl('','act','procNcenterliteRedirect', 'notify', $v->notify, 'url', $v->target_url); $value->url = getUrl('','act','procNcenterliteRedirect', 'notify', $value->notify, 'url', $value->target_url);
if($v->target_member_srl) if($value->target_member_srl)
{ {
$profileImage = $oMemberModel->getProfileImage($v->target_member_srl); $profileImage = $oMemberModel->getProfileImage($value->target_member_srl);
$v->profileImage = $profileImage->src; $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; $output->data = $list;
return $output; return $output;
} }
} }

2
modules/ncenterlite/ncenterlite.admin.view.php
View file

@ -105,8 +105,6 @@ class ncenterliteAdminView extends ncenterlite
Context::set('page', $output->page); Context::set('page', $output->page);
Context::set('ncenterlite_list', $output->data); Context::set('ncenterlite_list', $output->data);
Context::set('page_navigation', $output->page_navigation); Context::set('page_navigation', $output->page_navigation);
$this->setTemplateFile('ncenter_list');
} }
function dispNcenterliteAdminTest() function dispNcenterliteAdminTest()

6
modules/ncenterlite/tpl/ncenter_list.html → modules/ncenterlite/tpl/list.html
View file

@ -31,13 +31,9 @@
</thead> </thead>
<tbody> <tbody>
<!--@foreach($ncenterlite_list as $no => $val)--> <!--@foreach($ncenterlite_list as $no => $val)-->
{@
$oMemberModel = getModel('member');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($val->member_srl);
}
<tr> <tr>
<td>{$val->target_nick_name}</td> <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><a href="{$val->target_url}">{$val->text}</a></td>
<td> <td>
<span cond="$val->readed == 'Y'" style="color:#8582E6">{$lang->ncenterlite_read_y}</span> <span cond="$val->readed == 'Y'" style="color:#8582E6">{$lang->ncenterlite_read_y}</span>