diff --git a/modules/board/board.admin.controller.php b/modules/board/board.admin.controller.php index 571e972ce..e20225546 100644 --- a/modules/board/board.admin.controller.php +++ b/modules/board/board.admin.controller.php @@ -170,6 +170,7 @@ class boardAdminController extends board { } $module_info->hide_category = Context::get('hide_category') == 'Y' ? 'Y' : 'N'; + $module_info->allow_no_category = Context::get('allow_no_category') == 'Y' ? 'Y' : 'N'; $oModuleController = getController('module'); /* @var $oModuleController moduleController */ $output = $oModuleController->updateModule($module_info); if(!$output->toBool()) diff --git a/modules/board/board.view.php b/modules/board/board.view.php index 9156ff2e7..fc143777b 100644 --- a/modules/board/board.view.php +++ b/modules/board/board.view.php @@ -825,8 +825,14 @@ class boardView extends board /** * add JS filters **/ - if(Context::get('logged_info')->is_admin=='Y') Context::addJsFilter($this->module_path.'tpl/filter', 'insert_admin.xml'); - else Context::addJsFilter($this->module_path.'tpl/filter', 'insert.xml'); + if(Context::get('logged_info')->is_admin == 'Y' || $this->module_info->allow_no_category == 'Y') + { + Context::addJsFilter($this->module_path.'tpl/filter', 'insert_admin.xml'); + } + else + { + Context::addJsFilter($this->module_path.'tpl/filter', 'insert.xml'); + } $oSecurity = new Security(); $oSecurity->encodeHTML('category_list.text', 'category_list.title'); diff --git a/modules/board/lang/en.php b/modules/board/lang/en.php index f43c26044..502aeef6c 100644 --- a/modules/board/lang/en.php +++ b/modules/board/lang/en.php @@ -45,6 +45,8 @@ $lang->comment_status = 'Comments'; $lang->category_settings = 'Category settings'; $lang->hide_category = 'Hide categories'; $lang->about_hide_category = 'You can disable a category feature.'; +$lang->allow_no_category = 'Do not require category'; +$lang->about_allow_no_category = 'Allow users to write documents without selecting a category.'; $lang->protect_content = 'Protect Content'; $lang->protect_comment = 'Protect Comment'; $lang->protect_regdate = 'Update/Delete Time Limit'; diff --git a/modules/board/lang/ko.php b/modules/board/lang/ko.php index c54f92f92..a4a05406d 100644 --- a/modules/board/lang/ko.php +++ b/modules/board/lang/ko.php @@ -46,6 +46,8 @@ $lang->comment_status = '댓글'; $lang->category_settings = '분류 설정'; $lang->hide_category = '분류 숨기기'; $lang->about_hide_category = '임시로 분류를 사용하지 않으려면 체크하세요.'; +$lang->allow_no_category = '미분류 허용'; +$lang->about_allow_no_category = '분류를 선택하지 않은 글도 허용하려면 체크하세요.'; $lang->protect_content = '글 보호 기능'; $lang->protect_comment = '댓글 보호 기능'; $lang->protect_regdate = '기간 제한 기능'; diff --git a/modules/board/tpl/category_list.html b/modules/board/tpl/category_list.html index 8025a296f..9f0314d3c 100644 --- a/modules/board/tpl/category_list.html +++ b/modules/board/tpl/category_list.html @@ -19,6 +19,12 @@ +