mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-04 17:21:39 +09:00
Merge branch 'rhymix:master' into master
This commit is contained in:
commit
d327bb1926
43 changed files with 588 additions and 221 deletions
|
|
@ -1524,6 +1524,12 @@ class BoardView extends Board
|
|||
throw new Rhymix\Framework\Exception('msg_not_target');
|
||||
}
|
||||
|
||||
$features = Rhymix\Modules\Board\Models\Features::fromModuleInfo($this->module_info);
|
||||
if (!$features->{$target}->vote_log)
|
||||
{
|
||||
throw new Rhymix\Framework\Exceptions\FeatureDisabled;
|
||||
}
|
||||
|
||||
$output = executeQueryArray($queryId, $args);
|
||||
if(!$output->toBool())
|
||||
{
|
||||
|
|
@ -1538,7 +1544,11 @@ class BoardView extends Board
|
|||
{
|
||||
if($log->point > 0)
|
||||
{
|
||||
if($log->member_srl == $vote_member_infos[$log->member_srl]->member_srl)
|
||||
if (isset($vote_member_infos[$log->member_srl]))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
if (!$features->{$target}->vote_up_log)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
|
@ -1546,7 +1556,11 @@ class BoardView extends Board
|
|||
}
|
||||
else
|
||||
{
|
||||
if($log->member_srl == $blame_member_infos[$log->member_srl]->member_srl)
|
||||
if (isset($blame_member_infos[$log->member_srl]))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
if (!$features->{$target}->vote_down_log)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
|
@ -1554,6 +1568,8 @@ class BoardView extends Board
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
Context::set('board_features', $features);
|
||||
Context::set('vote_member_info', $vote_member_infos);
|
||||
Context::set('blame_member_info', $blame_member_infos);
|
||||
$this->setTemplateFile('vote_log');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue