Prevent renaming or deleting the default scrap folder

This commit is contained in:
Kijin Sung 2017-09-28 14:33:42 +09:00
parent 25b6e71cf4
commit 645902fc41
6 changed files with 24 additions and 2 deletions

View file

@ -122,6 +122,7 @@ $lang->cmd_send_email = 'Send Mail';
$lang->msg_email_not_exists = 'You have entered an invalid email address.';
$lang->msg_alreay_scrapped = 'This article is already scrapped.';
$lang->msg_folder_alreay_exists = 'A folder with the same name already exists.';
$lang->msg_folder_is_default = 'The default folder cannot be renamed or deleted.';
$lang->msg_folder_not_empty = 'The folder is not empty.';
$lang->msg_cart_is_null = 'Please select the target.';
$lang->msg_checked_file_is_deleted = '%d attached file(s) is(are) deleted.';

View file

@ -126,6 +126,7 @@ $lang->cmd_member_profile_view = '회원 프로필사진 보이기';
$lang->msg_email_not_exists = '이메일 주소가 존재하지 않습니다.';
$lang->msg_alreay_scrapped = '이미 스크랩된 게시물입니다.';
$lang->msg_folder_alreay_exists = '이미 존재하는 폴더 이름입니다.';
$lang->msg_folder_is_default = '기본 폴더는 이름을 변경하거나 삭제할 수 없습니다.';
$lang->msg_folder_not_empty = '폴더가 비어 있지 않습니다.';
$lang->msg_cart_is_null = '대상을 선택해주세요.';
$lang->msg_checked_file_is_deleted = '%d개의 첨부 파일이 삭제되었습니다.';

View file

@ -308,6 +308,10 @@ class memberController extends member
{
return new Object(-1, 'msg_invalid_request');
}
if(array_first($output->data)->name === '/DEFAULT/')
{
return new Object(-1, 'msg_folder_is_default');
}
// Check existing folder with same name
$args = new stdClass;
@ -354,6 +358,10 @@ class memberController extends member
{
return new Object(-1, 'msg_invalid_request');
}
if(array_first($output->data)->name === '/DEFAULT/')
{
return new Object(-1, 'msg_folder_is_default');
}
// Check that the folder is empty
$args = new stdClass;

View file

@ -447,6 +447,17 @@ class memberView extends member
{
$folder_srl = array_first($folders)->folder_srl;
}
// Get folder info
$folder_info = new stdClass;
foreach($folders as $folder)
{
if($folder->folder_srl == $folder_srl)
{
$folder_info = $folder;
break;
}
}
// Get scrapped documents in selected folder
$args = new stdClass();
@ -460,6 +471,7 @@ class memberView extends member
Context::set('document_list', $output->data);
Context::set('page_navigation', $output->page_navigation);
Context::set('scrap_folders', $folders);
Context::set('folder_info', $folder_info);
Context::set('folder_srl', $folder_srl);
$security = new Security($output->data);

View file

@ -8,7 +8,7 @@
<option value="{$folder->folder_srl}" selected="selected"|cond="$folder_srl == $folder->folder_srl">{$folder->name == '/DEFAULT/' ? $lang->default_folder : $folder->name}</option>
<!--@endforeach-->
</select>
<div class="btn-group">
<div class="btn-group" cond="$folder_info->name !== '/DEFAULT/'">
<input type="text" class="folder_name" style="margin:0;display:none" />
<button id="scrap_folder_rename" class="btn" data-folder-srl="{$folder_srl}">{$lang->scrap_folder_rename}</button>
<button id="scrap_folder_delete" class="btn" data-folder-srl="{$folder_srl}">{$lang->scrap_folder_delete}</button>

View file

@ -8,7 +8,7 @@
<option value="{$folder->folder_srl}" selected="selected"|cond="$folder_srl == $folder->folder_srl">{$folder->name == '/DEFAULT/' ? $lang->default_folder : $folder->name}</option>
<!--@endforeach-->
</select>
<div class="btn-group">
<div class="btn-group" cond="$folder_info->name !== '/DEFAULT/'">
<input type="text" class="folder_name" style="margin:0;display:none" />
<button id="scrap_folder_rename" class="btn" data-folder-srl="{$folder_srl}">{$lang->scrap_folder_rename}</button>
<button id="scrap_folder_delete" class="btn" data-folder-srl="{$folder_srl}">{$lang->scrap_folder_delete}</button>