fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-24 12:52:19 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:xpressengine/xe-core into develop

Browse source
This commit is contained in:
bnu 2015-03-23 14:05:48 +09:00
commit 26ae426b06
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/document/document.controller.php
View file

@ -39,7 +39,9 @@ class documentController extends document
if($document_config->use_vote_up=='N') return new Object(-1, 'msg_invalid_request');
$point = 1;
return $this->updateVotedCount($document_srl, $point);
$output = $this->updateVotedCount($document_srl, $point);
$this->add('voted_count', $output->get('voted_count'));
return $output;
}
/**
@ -82,7 +84,9 @@ class documentController extends document
if($document_config->use_vote_down=='N') return new Object(-1, 'msg_invalid_request');
$point = -1;
return $this->updateVotedCount($document_srl, $point);
$output = $this->updateVotedCount($document_srl, $point);
$this->add('blamed_count', $output->get('blamed_count'));
return $output;
}
/**

2
modules/trash/tpl/trash_list.html
View file

@ -29,6 +29,7 @@ var no_text_comment = '{$lang->no_text_comment}';
<thead>
<tr>
<th scope="col" class="title">{$lang->document}</th>
<th scope="col" class="nowr">{$lang->nick_name}</th>
<th scope="col" class="nowr">{$lang->origin_module_type}</th>
<th scope="col" class="nowr">{$lang->trash_nick_name}</th>
<th scope="col" class="nowr">{$lang->trash_date}</th>
@ -48,6 +49,7 @@ var no_text_comment = '{$lang->no_text_comment}';
<a href="{getUrl('act','dispTrashAdminView','trash_srl',$oTrashVO->getTrashSrl())}">{$oTrashVO->getTitle()}</a>
</block>
</td>
<td class="nowr"><a href="#popup_menu_area" class="member_{$oTrashVO->unserializedObject['member_srl']}">{$oTrashVO->unserializedObject['nick_name']}</a></td>
<td class="nowr"><!--@if($oTrashVO->getOriginModule() == 'document')-->{$lang->document}<!--@else-->{$lang->comment}<!--@end--></td>
<td class="nowr"><a href="#popup_menu_area" class="member_{$oTrashVO->getRemoverSrl()}">{$oTrashVO->getNickName()}</a></td>
<td class="nowr">{zdate($oTrashVO->getRegdate(), "Y-m-d H:i:s")}</td>