fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 17:21:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1331 from bjrambo/pr/trash-list

Browse source 
#1330 댓글에 텍스트가 없는 상태에서 휴지통으로 이동시 문제 고침.
This commit is contained in:
BJRambo 2020-06-30 16:35:32 +09:00 • committed by GitHub
commit 9d93d7ddc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/comment/lang/en.php
View file

@ -26,6 +26,7 @@ $lang->search_target_list['last_update'] = 'Last update';
$lang->search_target_list['ipaddress'] = 'IP Address';
$lang->search_target_list['is_secret'] = 'Status';
$lang->no_text_comment = 'No text in this comment.';
$lang->no_text_document = 'No text in this document.';
$lang->secret_name_list['Y'] = 'Secret';
$lang->secret_name_list['N'] = 'Public';
$lang->published_name_list[0] = 'Waiting';

1
modules/comment/lang/ko.php
View file

@ -26,6 +26,7 @@ $lang->search_target_list['last_update'] = '최근수정일 ';
$lang->search_target_list['ipaddress'] = 'IP 주소';
$lang->search_target_list['is_secret'] = '상태';
$lang->no_text_comment = '글자가 없는 댓글입니다.';
$lang->no_text_document = '글자가 없는 게시글입니다.';
$lang->secret_name_list['Y'] = '비밀';
$lang->secret_name_list['N'] = '공개';
$lang->published_name_list[0] = '대기';

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

@ -54,13 +54,20 @@ var no_text_comment = '{$lang->no_text_comment}';
<tr loop="$trash_list => $no, $oTrashVO">
<td class="nowr"><!--@if($oTrashVO->getOriginModule() == 'document')-->{$lang->document}<!--@else-->{$lang->comment}<!--@end--></td>
<td class="title">
<strong cond="!trim($oTrashVO->getTitle()) && $oTrashVO->getOriginModule() == 'comment'">{$lang->no_text_comment}</strong>
<block cond="trim($oTrashVO->getTitle())">
<block cond="isset($module_list[$oTrashVO->unserializedObject['module_srl']])">
<a href="{getUrl('', 'mid', $module_list[$oTrashVO->unserializedObject['module_srl']]->mid)}" target="_blank">{$module_list[$oTrashVO->unserializedObject['module_srl']]->browser_title}</a> -
</block>
<a href="{getUrl('act','dispTrashAdminView','trash_srl',$oTrashVO->getTrashSrl())}">{$oTrashVO->getTitle()}</a>
</block>
<!--@if(trim($oTrashVO->getTitle()))-->
<!--@if(isset($module_list[$oTrashVO->unserializedObject['module_srl']]))-->
<a href="{getUrl('', 'mid', $module_list[$oTrashVO->unserializedObject['module_srl']]->mid)}" target="_blank">{$module_list[$oTrashVO->unserializedObject['module_srl']]->browser_title}</a> -
<!--@end-->
<a href="{getUrl('act','dispTrashAdminView','trash_srl',$oTrashVO->getTrashSrl())}">{$oTrashVO->getTitle()}</a>
<!--@else-->
<a href="{getUrl('act','dispTrashAdminView','trash_srl',$oTrashVO->getTrashSrl())}">
<!--@if($oTrashVO->getOriginModule() == 'comment')-->
{$lang->no_text_comment}
<!--@else-->
{$lang->no_text_document}
<!--@end-->
</a>
<!--@end-->
</td>
<td class="nowr"><a href="#popup_menu_area" class="member_{$oTrashVO->unserializedObject['member_srl']}">{$oTrashVO->unserializedObject['nick_name']}</a></td>
<td class="nowr">{$oTrashVO->unserializedObject['ipaddress']}</td>