fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 10:11:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Save per-board configuration

Browse source
This commit is contained in:
BJRambo 2016-05-14 00:21:55 +09:00
parent 173dd35d42
commit f7367f2888
10 changed files with 15 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -292,10 +292,8 @@ class boardController extends board
}
}
// generate document module controller object
$oTrashModel = getModel('trash');
$config = $oTrashModel->getConfig();
$oDocumentController = getController('document');
if($config->trash_use == 'Y')
if($this->module_info->trash_use == 'Y')
{
// move the trash
$output = $oDocumentController->moveDocumentToTrash($oDocument);

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

@ -69,3 +69,5 @@ $lang->msg_admin_update_log = '관리자가 수정한 적이 있는 게시물입
$lang->msg_update_log_revert = '정말로 이 버전으로 되돌리시겠습니까?';
$lang->write_admin = '관리자작성';
$lang->revert_reason_update = '이 버전으로 되돌림';
$lang->document_force_to_move = '삭제시 휴지통으로 강제이동';
$lang->about_document_force_to_move = '게시글을 삭제시 휴지통으로 강제이동할지 않할지를 선택하는 옵션입니다.';

12
modules/board/tpl/board_insert.html
View file

@ -238,6 +238,18 @@
<p>{$lang->msg_warning_update_log}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label">{$lang->document_force_to_move}</label>
<div class="x_controls">
<label class="x_inline">
<input type="radio" id="trash_use_y" name="trash_use" value="Y" checked="checked"|cond="$config->trash_use == 'Y'" /> {$lang->cmd_yes}
</label>
<label class="x_inline">
<input type="radio" id="trash_use_n" name="trash_use" value="N" checked="checked"|cond="$config->trash_use == 'N'" /> {$lang->cmd_no}
</label>
<p class="x_help-block">{$lang->about_document_force_to_move}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label">{$lang->protect_content}</label>
<div class="x_controls">

2
modules/trash/conf/module.xml
View file

@ -7,12 +7,10 @@
</permissions>
<actions>
<action name="dispTrashAdminList" type="view" admin_index="true" menu_name="trash" menu_index="true" />
<action name="dispTrashAdminConfig" type="view" />
<action name="procTrashAdminEmptyTrash" type="controller" ruleset="emptyTrash" />
<action name="procTrashAdminRestore" type="controller" />
<action name="procTrashAdminGetList" type="controller" />
<action name="procTrashAdminConfig" type="controller" />
<action name="dispTrashAdminView" type="view" />
</actions>

5
modules/trash/lang/ko.php
View file

@ -19,9 +19,4 @@ $lang->trasher = '삭제자';
$lang->origin_info = '원문 정보';
$lang->delete_info = '삭제 정보';
$lang->cmd_restore = '복원';
$lang->cmd_trash_setting = '휴지통 설정';
$lang->cmd_trash_list = '휴지통 목록';
$lang->document_force_to_move = '삭제시 휴지통으로 강제이동';
$lang->force_to_move = '휴지통으로 강제이동';
$lang->do_not_forceto_move = '강제이동을 하지않음';
$lang->about_document_force_to_move = '게시글을 삭제시 휴지통으로 강제이동할지 않할지를 선택하는 옵션입니다.';

25
modules/trash/tpl/config.html
View file

@ -1,25 +0,0 @@
<include target="./header.html" />
<form action="{getUrl()}" method="post" class="x_form-horizontal" id="fo_trash">
<input type="hidden" name="module" value="trash" />
<input type="hidden" name="act" value="procTrashAdminConfig" />
<section class="section">
<div class="x_control-group">
<label class="x_control-label">{$lang->document_force_to_move}</label>
<div class="x_controls">
<label class="x_inline">
<input type="radio" id="trash_use_y" name="trash_use" value="Y" checked="checked"|cond="$config->trash_use == 'Y'" /> {$lang->force_to_move}
</label>
<label class="x_inline">
<input type="radio" id="trash_use_n" name="trash_use" value="N" checked="checked"|cond="$config->trash_use == 'N'" /> {$lang->do_not_forceto_move}
</label>
<p class="x_help-block">{$lang->about_document_force_to_move}</p>
</div>
</div>
</section>
<div class="x_clearfix btnArea">
<div class="x_pull-right">
<button class="x_btn x_btn-primary" type="submit">{$lang->cmd_registration}</button>
</div>
</div>
</form>

1
modules/trash/tpl/header.html
View file

@ -6,7 +6,6 @@
<div class="header4">
<ul class="x_nav x_nav-tabs">
<li class="x_active"|cond="$act=='dispTrashAdminList'"><a href="{getUrl('act','dispTrashAdminList')}">{$lang->cmd_trash_list}</a></li>
<li class="x_active"|cond="$act=='dispTrashAdminConfig'"><a href="{getUrl('act', 'dispTrashAdminConfig')}">{$lang->cmd_trash_setting}</a></li>
</ul>
</div>

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

@ -3,7 +3,6 @@ var confirm_restore_msg = '{$lang->confirm_restore}';
var no_text_comment = '{$lang->no_text_comment}';
</script>
<load target="js/trash_admin.js" />
<include target="./header.html" />
<form ruleset="emptyTrash" action="./" method="post">
<input type="hidden" name="module" value="trash" />

24
modules/trash/trash.admin.controller.php
View file

@ -226,30 +226,6 @@ class trashAdminController extends trash
return true;
}
/**
* set trash module config
* @return void|Object
*/
function procTrashAdminConfig()
{
$oTrashModel = getModel('trash');
$config = $oTrashModel->getConfig();
$oModuleController = getController('module');
$obj = Context::getRequestVars();
$config->trash_use = $obj->trash_use;
$output = $oModuleController->updateModuleConfig('trash', $config);
if(!$output->toBool())
{
$this->setMessage('success_updated');
}
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminConfig');
$this->setRedirectUrl($returnUrl);
}
}
/* End of file trash.admin.controller.php */
/* Location: ./modules/trash/trash.admin.controller.php */

10
modules/trash/trash.admin.view.php
View file

@ -110,16 +110,6 @@ class trashAdminView extends trash
}
$this->setTemplateFile('trash_view');
}
function dispTrashAdminConfig()
{
$oTrashModel = getModel('trash');
$config = $oTrashModel->getConfig();
Context::set('config', $config);
$this->setTemplateFile('config');
}
}
/* End of file trash.admin.view.php */
/* Location: ./modules/trash/trash.admin.view.php */