Vote queries have been modified differently depending on the target

This commit is contained in:
BJRambo 2017-01-07 17:42:39 +09:00
parent 40b7feedfc
commit e0aad1839a
2 changed files with 36 additions and 28 deletions

View file

@ -1216,49 +1216,57 @@ class boardView extends board
{ {
return new Object(-1, 'msg_not_permitted'); return new Object(-1, 'msg_not_permitted');
} }
$oMemberModel = getModel('member');
$target = Context::get('target'); $target = Context::get('target');
$target_srl = Context::get('target_srl');
$args = new stdClass();
if($target === 'document') if($target === 'document')
{ {
$document_srl = Context::get('document_srl'); $queryId = 'document.getDocumentVotedLog';
$oMemberModel = getModel('member'); $args->document_srl = $target_srl;
}
elseif($target === 'comment')
{
$queryId = 'comment.getCommentVotedLog';
$args->comment_srl = $target_srl;
}
else
{
return new Object(-1, 'Target name error');
}
$args = new stdClass(); $output = executeQueryArray($queryId, $args);
$args->document_srl = $document_srl; if(!$output->toBool())
{
return $output;
}
$output = executeQueryArray('document.getDocumentVotedLog', $args); $vote_member_infos = array();
if(!$output->toBool()) $blame_member_infos = array();
if(count($output->data) > 0)
{
foreach($output->data as $key => $log)
{ {
return $output; if($log->point > 0)
}
$vote_member_infos = array();
$blame_member_infos = array();
if(count($output->data) > 0)
{
foreach($output->data as $key => $log)
{ {
if($log->point > 0) if($log->member_srl == $vote_member_infos[$log->member_srl]->member_srl)
{ {
if($log->member_srl == $vote_member_infos[$log->member_srl]->member_srl) continue;
{
continue;
}
$vote_member_infos[$log->member_srl] = $oMemberModel->getMemberInfoByMemberSrl($log->member_srl);
} }
else $vote_member_infos[$log->member_srl] = $oMemberModel->getMemberInfoByMemberSrl($log->member_srl);
}
else
{
if($log->member_srl == $blame_member_infos[$log->member_srl]->member_srl)
{ {
if($log->member_srl == $blame_member_infos[$log->member_srl]->member_srl) continue;
{
continue;
}
$blame_member_infos[$log->member_srl] = $oMemberModel->getMemberInfoByMemberSrl($log->member_srl);
} }
$blame_member_infos[$log->member_srl] = $oMemberModel->getMemberInfoByMemberSrl($log->member_srl);
} }
} }
} }
Context::set('vote_member_info', $vote_member_infos); Context::set('vote_member_info', $vote_member_infos);
Context::set('blame_member_info', $blame_member_infos); Context::set('blame_member_info', $blame_member_infos);
$this->setTemplateFile('vote_log'); $this->setTemplateFile('vote_log');

View file

@ -115,7 +115,7 @@
<div cond="$oDocument->getSignature()" class="tx">{$oDocument->getSignature()}</div> <div cond="$oDocument->getSignature()" class="tx">{$oDocument->getSignature()}</div>
</div> </div>
<div class="btnArea"> <div class="btnArea">
<a class="btn" href="{getUrl('act','dispBoardVoteLog','document_srl',$oDocument->document_srl,'target','document')}"><i class="xi-list-ul"></i>추천인 목록</a> <a class="btn" href="{getUrl('act','dispBoardVoteLog','target_srl',$oDocument->document_srl,'target','document')}"><i class="xi-list-ul"></i>추천인 목록</a>
<a cond="$update_view" class="btn" href="{getUrl('act','dispBoardUpdateLog','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-list-ul"></i>{$lang->update_log}</a> <a cond="$update_view" class="btn" href="{getUrl('act','dispBoardUpdateLog','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-list-ul"></i>{$lang->update_log}</a>
<a cond="$oDocument->isEditable()" class="btn" href="{getUrl('act','dispBoardWrite','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-eraser"></i>{$lang->cmd_modify}</a> <a cond="$oDocument->isEditable()" class="btn" href="{getUrl('act','dispBoardWrite','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-eraser"></i>{$lang->cmd_modify}</a>
<a cond="$oDocument->isEditable()" class="btn" href="{getUrl('act','dispBoardDelete','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-trash"></i>{$lang->cmd_delete}</a> <a cond="$oDocument->isEditable()" class="btn" href="{getUrl('act','dispBoardDelete','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-trash"></i>{$lang->cmd_delete}</a>