fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-28 06:42:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #512 from bjrambo/pr/comment-add-features

Browse source 
댓글 자리 유지 기능에 완전 삭제 기능을 추가하였습니다.
This commit is contained in:
BJRambo 2016-05-26 21:47:42 +09:00
commit e69e0697a4
6 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/board/board.controller.php
View file

@ -482,6 +482,13 @@ class boardController extends board
{
// get the comment_srl
$comment_srl = Context::get('comment_srl');
$instant_delete = null;
if($this->grant->manager == true)
{
$instant_delete = Context::get('instant_delete');
}
if(!$comment_srl)
{
return new Object(-1, 'msg_invalid_request');
@ -510,13 +517,13 @@ class boardController extends board
// generate comment controller object
$oCommentController = getController('comment');
if($this->module_info->comment_delete_message === 'yes')
if($this->module_info->comment_delete_message === 'yes' && $instant_delete != 'Y')
{
$comment->content = '';
$comment->status = 7;
$output = $oCommentController->updateCommentByDelete($comment, $this->grant->manager);
}
elseif($this->module_info->comment_delete_message === 'only_commnet')
elseif($this->module_info->comment_delete_message === 'only_commnet' && $instant_delete != 'Y')
{
$childs = $oCommentModel->getChildComments($comment_srl);
if(count($childs) > 0)

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

@ -47,3 +47,4 @@ $lang->about_comment_delete_message = 'When a comment is deleted, leave a placeh
$lang->cmd_only_p_comment = 'Only if there are replies';
$lang->cmd_all_comment_message = 'Always';
$lang->cmd_do_not_message = 'Never';
$lang->delete_placeholder = 'Delete Placeholder';

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

@ -76,3 +76,4 @@ $lang->about_comment_delete_message = '댓글 삭제시 완전히 지우지 않
$lang->cmd_only_p_comment = '대댓글이 있는 경우에만 남김';
$lang->cmd_all_comment_message = '모든 댓글에 남김';
$lang->cmd_do_not_message = '남기지 않음';
$lang->delete_placeholder = '완전 삭제';

3
modules/board/skins/xedition/_comment.html
View file

@ -52,6 +52,9 @@
<a cond="$comment->isGranted()||!$comment->get('member_srl')" href="{getUrl('act','dispBoardDeleteComment','comment_srl',$comment->comment_srl)}" class="delete"><i class="xi-trash"></i> {$lang->cmd_delete}</a>
<a cond="$is_logged" class="comment_{$comment->comment_srl} this" href="#popup_menu_area" onclick="return false">{$lang->cmd_comment_do}</a>
</p>
<p class="action" cond="$comment->status >= 7">
<a cond="$grant->manager" href="{getUrl('act','dispBoardDeleteComment','comment_srl',$comment->comment_srl)}" class="delete"><i class="xi-trash"></i> {$lang->delete_placeholder}</a>
</p>
</li>
</ul>
<div cond="$oDocument->comment_page_navigation" class="pagination">

7
modules/board/skins/xedition/delete_comment_form.html
View file

@ -11,10 +11,15 @@
<input type="hidden" name="page" value="{$page}" />
<input type="hidden" name="document_srl" value="{$oComment->get('document_srl')}" />
<input type="hidden" name="comment_srl" value="{$oComment->get('comment_srl')}" />
<h1>{sprintf($lang->comfirm_act_msg,$lang->comment,$lang->cmd_delete,$lang->msg_eul)}</h1>
<div class="btnArea">
<label for="instant_delete" cond="$grant->manager" style="line-height: 24px;">
<input type="checkbox" id="instant_delete" name="instant_delete" value="Y" cond="$grant->manager" checked="checked"|cond="$oComment->status >= 7" style="vertical-align: middle;" />
{$lang->delete_placeholder}
</label>
<input type="submit" class="btn" value="{$lang->cmd_delete}" />
<button type="button" class="btn" onclick="history.back()">{$lang->cmd_cancel}</button>
</div>
</form>
<include target="_footer.html" />
<include target="_footer.html" />

2
modules/board/skins/xedition/delete_form.html
View file

@ -15,4 +15,4 @@
<button type="button" class="btn" onclick="history.back()">{$lang->cmd_cancel}</button>
</div>
</form>
<include target="_footer.html" />
<include target="_footer.html" />