fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 02:31:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

휴지통 기능 추가

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5914 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
rubyeye 2009-03-19 04:27:16 +00:00
parent cafe2ac4a0
commit 19a6b5fcc1
18 changed files with 400 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,7 @@
<action name="dispDocumentAdminConfig" type="view" standalone="true" />
<action name="dispDocumentAdminAlias" type="view" standalone="true" />
<action name="dispDocumentAdminDeclared" type="view" standalone="true" />
<action name="dispDocumentAdminTrashList" type="view" standalone="true" />
<action name="getDocumentAdminCategoryTplInfo" type="model" standalone="true"/>
@ -35,6 +36,7 @@
<action name="procDocumentAdminMakeXmlFile" type="controller" standalone="true"/>
<action name="procDocumentAdminInsertAlias" type="controller" standalone="true"/>
<action name="procDocumentAdminDeleteAlias" type="controller" standalone="true"/>
<action name="procDocumentAdminRestoreTrash" type="controller" standalone="true"/>
<action name="procAdminMoveExtraVar" type="controller" standalone="true"/>
<action name="procDocumentAdminInsertExtraVar" type="controller" standalone="true" />

38
modules/document/document.admin.controller.php
View file

@ -620,6 +620,44 @@
$alias_srl = Context::get('alias_srl');
$args->alias_srl = $alias_srl;
$output = executeQuery("document.deleteAlias", $args);
if (!$output->toBool())
{
return $output;
}
}
function procDocumentAdminRestoreTrash() {
$trash_srl = Context::get('trash_srl');
$oDB = &DB::getInstance();
$trash_args->trash_srl = $trash_srl;
$output = executeQuery('document.getTrash', $args);
if (!$output->toBool()) {
return $output;
}
$document_args->document_srl = $output->data->document_srl;
$document_args->module_srl = $output->data->module_srl;
// begin transaction
$oDB->begin();
$output = executeQuery('document.updateDocument', $document_args);
if (!$output->toBool()) {
$oDB->rollback();
return $output;
}
$output = executeQuery('document.deleteTrash', $trash_args);
if (!$output->toBool()) {
$oDB->rollback();
return $output;
}
// commit
$oDB->commit();
}
}

69
modules/document/document.admin.model.php
View file

@ -75,5 +75,74 @@
$this->add('tpl', $tpl);
}
/**
* @brief 휴지통에 존재하는 문서 목록을 가져옴
**/
function getDocumentTrashList($obj) {
// 정렬 대상과 순서 체크
if (!in_array($obj->sort_index, array('list_order','delete_date','title'))) $obj->sort_index = 'list_order';
if (!in_array($obj->order_type, array('desc','asc'))) $obj->order_type = 'asc';
// module_srl 대신 mid가 넘어왔을 경우는 직접 module_srl을 구해줌
if ($obj->mid) {
$oModuleModel = &getModel('module');
$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
unset($obj->mid);
}
// 넘어온 module_srl은 array일 수도 있기에 array인지를 체크
if (is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
else $args->module_srl = $obj->module_srl;
// 변수 체크
$args->sort_index = $obj->sort_index;
$args->order_type = $obj->order_type;
$args->page = $obj->page?$obj->page:1;
$args->list_count = $obj->list_count?$obj->list_count:20;
$args->page_count = $obj->page_count?$obj->page_count:10;
$args->member_srl = $obj->member_srl;
// query_id 지정
$query_id = 'document.getTrashList';
// query 실행
$output = executeQueryArray($query_id, $args);
// 결과가 없거나 오류 발생시 그냥 return
if (!$output->toBool() || !count($output->data)) return $output;
$idx = 0;
$data = $output->data;
unset($output->data);
$keys = array_keys($data);
$virtual_number = $keys[0];
foreach($data as $key => $attribute) {
$oDocument = null;
$oDocument = new documentItem();
$oDocument->setAttribute($attribute, false);
if ($is_admin) $oDocument->setGrant();
$output->data[$virtual_number] = $oDocument;
$virtual_number--;
}
return $output;
}
/**
* @brief trash_srl값을 가지는 휴지통 문서를 가져옴
**/
function getDocumentTrash($trash_srl) {
$args->trash_srl = $trash_srl;
$output = executeQuery('document.getTrash', $args);
$node = $output->data;
if (!$node) return;
return $node;
}
}
?>

27
modules/document/document.admin.view.php
View file

@ -128,5 +128,32 @@
$this->setTemplatePath($this->module_path.'tpl');
$this->setTemplateFile('document_alias');
}
function dispDocumentAdminTrashList() {
// 목록을 구하기 위한 옵션
$args->page = Context::get('page'); ///< 페이지
$args->list_count = 30; ///< 한페이지에 보여줄 글 수
$args->page_count = 10; ///< 페이지 네비게이션에 나타날 페이지의 수
$args->sort_index = 'list_order'; ///< 소팅 값
$args->order_type = 'desc'; ///< 소팅 정렬 값
$args->module_srl = Context::get('module_srl');
// 목록을 구함
$oDocumentAdminModel = &getAdminModel('document');
$output = $oDocumentAdminModel->getDocumentTrashList($args);
// 템플릿에 쓰기 위해서 document_admin_model::getDocumentTrashList() 의 return object에 있는 값들을 세팅
Context::set('total_count', $output->total_count);
Context::set('total_page', $output->total_page);
Context::set('page', $output->page);
Context::set('document_list', $output->data);
Context::set('page_navigation', $output->page_navigation);
// 템플릿 지정
$this->setTemplatePath($this->module_path.'tpl');
$this->setTemplateFile('document_trash_list');
}
}
?>

65
modules/document/document.controller.php
View file

@ -460,6 +460,59 @@
return $output;
}
/**
* @brief 문서를 휴지통으로 옮김
**/
function moveDocumentToTrash($obj) {
// 주어진 trash_srl이 없으면 trash_srl 등록
if(!$obj->trash_srl) $trash_args->trash_srl = getNextSequence();
else $trash_args->trash_srl = $obj->trash_srl;
// 해당 document가 속해 잇는 module_srl을 구한다
$oDocumentModel = &getModel('document');
$oDocument = $oDocumentModel->getDocument($obj->document_srl);
$trash_args->module_srl = $oDocument->get('module_srl');
// 데이터 설정
$trash_args->document_srl = $obj->document_srl;
$trash_args->description = $obj->description;
// 수동 등록이 아니고 로그인 된 회원일 경우 회원의 정보를 입력
if(Context::get('is_logged')&&!$manual_inserted) {
$logged_info = Context::get('logged_info');
$trash_args->member_srl = $logged_info->member_srl;
$trash_args->user_id = $logged_info->user_id;
$trash_args->user_name = $logged_info->user_name;
$trash_args->nick_name = $logged_info->nick_name;
}
// documents update를 위한 데이터 설정
$document_args->module_srl = 0;
$document_args->document_srl = $obj->document_srl;
// begin transaction
$oDB = &DB::getInstance();
$oDB->begin();
$output = executeQuery('document.insertTrash', $trash_args);
if (!$output->toBool()) {
$oDB->rollback();
return $output;
}
$output = executeQuery('document.updateDocument', $document_args);
if (!$output->toBool()) {
$oDB->rollback();
return $output;
}
// commit
$oDB->commit();
return $output;
}
/**
* @brief 특정 모듈의 공지사항 글에 대해 캐시
**/
@ -1326,6 +1379,18 @@
}
$oDB->commit();
$msg_code = 'success_deleted';
} elseif($type == 'trash') {
$args->description = $message_content;
$oDB = &DB::getInstance();
$oDB->begin();
for($i=0;$i<$document_srl_count;$i++) {
$args->document_srl = $document_srl_list[$i];
$output = $this->moveDocumentToTrash($args);
if(!$output->toBool()) return new Object(-1, 'fail_to_trash');
}
$oDB->commit();
$msg_code = 'success_trashed';
}
$_SESSION['document_management'] = array();

1
modules/document/document.model.php
View file

@ -399,7 +399,6 @@
return $result;
}
/**
* @brief document의 확장 변수 키값을 가져오는 함수
* $form_include : 글 작성시에 필요한 확장변수의 input form 추가 여부

25
modules/document/lang/ko.lang.php
View file

@ -70,4 +70,29 @@
$lang->history = '히스토리';
$lang->about_use_history = '히스토리 기능의 사용여부를 지정합니다. 히스토리 기능을 사용할 경우 문서 수정시 이전 리비전을 기록하고 복원할 수 있습니다.';
$lang->trace_only = '흔적만 남김';
$lang->cmd_trash = "휴지통";
$lang->cmd_restore = "복원";
$lang->cmd_restore_all = "모두 복원";
$lang->in_trash = "휴지통";
$lang->trash_nick_name = "삭제자 닉네임";
$lang->trash_date = "삭제 날짜";
$lang->trash_description = "설명";
// 관리자 페이지에서 휴지통의 검색할 대상
$lang->search_target_trash_list = array(
'title' => '제목',
'content' => '내용',
'user_id' => '아이디',
'member_srl' => '회원번호',
'user_name' => '사용자 이름',
'nick_name' => '닉네임',
'trash_member_srl' => '삭제자 회원번호',
'trash_user_name' => '삭제자 사용자 이름',
'trash_nick_name' => '삭제자 닉네임',
'trash_date' => '삭제일',
'trash_ipaddress' => '삭제자 IP 주소',
);
?>

8
modules/document/queries/deleteTrash.xml Normal file
View file

@ -0,0 +1,8 @@
<query id="deleteTrash" action="delete">
<tables>
<table name="document_trash" />
</tables>
<conditions>
<condition operation="equal" column="trash_srl" var="trash_srl" filter="number" notnull="notnull" />
</conditions>
</query>

11
modules/document/queries/getTrash.xml Normal file
View file

@ -0,0 +1,11 @@
<query id="getTrash" action="select">
<tables>
<table name="document_trash" />
</tables>
<columns>
<column name="*" />
</columns>
<conditions>
<condition operation="equal" column="trash_srl" var="trash_srl" filter="number" notnull="notnull" />
</conditions>
</query>

29
modules/document/queries/getTrashList.xml Normal file
View file

@ -0,0 +1,29 @@
<query id="getTrashList" action="select">
<tables>
<table name="documents" />
<table name="document_trash" />
</tables>
<columns>
<column name="documents.*" />
<column name="document_trash.trash_srl" alias="trash_srl" />
<column name="document_trash.module_srl" alias="module_srl" />
<column name="document_trash.trash_date" alias="trash_date" />
<column name="document_trash.description" alias="trash_description" />
<column name="document_trash.ipaddress" alias="trash_ipaddress" />
<column name="document_trash.user_id" alias="trash_user_id" />
<column name="document_trash.user_name" alias="trash_user_name" />
<column name="document_trash.nick_name" alias="trash_nick_name" />
<column name="document_trash.member_srl" alias="trash_member_srl" />
</columns>
<conditions>
<condition operation="equal" column="document_trash.document_srl" default="documents.document_srl" notnull="notnull" />
<condition operation="in" column="document_trash.module_srl" var="module_srl" filter="number" pipe="and" />
<condition operation="equal" column="document_trash.member_srl" var="member_srl" filter="number" pipe="and" />
</conditions>
<navigation>
<index var="sort_index" default="documents.list_order" order="order_type" />
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />
</navigation>
</query>

17
modules/document/queries/insertTrash.xml Normal file
View file

@ -0,0 +1,17 @@
<query id="insertTrash" action="insert">
<tables>
<table name="document_trash" />
</tables>
<columns>
<column name="trash_srl" var="trash_srl" filter="number" notnull="notnull" />
<column name="document_srl" var="document_srl" filter="number" notnull="notnull" />
<column name="module_srl" var="module_srl" filter="number" default="0" />
<column name="trash_date" var="trash_date" default="curdate()" />
<column name="description" var="description" />
<column name="ipaddress" var="ipaddress" default="ipaddress()" />
<column name="user_id" var="user_id" default="" />
<column name="user_name" var="user_name" default="" />
<column name="nick_name" var="nick_name" notnull="notnull" minlength="1" maxlength="40" />
<column name="member_srl" var="member_srl" default="0" filter="number" />
</columns>
</query>

2
modules/document/queries/updateCategoryCount.xml
View file

@ -1,4 +1,4 @@
<query id="updateCategory" action="update">
<query id="updateCategoryCount" action="update">
<tables>
<table name="document_categories" />
</tables>

12
modules/document/schemas/document_trash.xml Normal file
View file

@ -0,0 +1,12 @@
<table name="document_trash">
<column name="trash_srl" type="number" size="11" default="0" notnull="notnull" primary_key="primary_key" />
<column name="document_srl" type="number" size="11" default="0" notnull="notnull" index="idx_document_srl" />
<column name="module_srl" type="number" size="11" default="0" notnull="notnull" index="idx_module_srl" />
<column name="trash_date" type="date" index="idx_trash_date" />
<column name="description" type="text" />
<column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress" />
<column name="user_id" type="varchar" size="80" />
<column name="user_name" type="varchar" size="80" notnull="notnull" />
<column name="nick_name" type="varchar" size="80" notnull="notnull" />
<column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />
</table>

1
modules/document/tpl/checked_list.html
View file

@ -52,6 +52,7 @@
<!--@if(count($document_list))-->
<div id="popFooter">
<a href="#" onclick="doManageDocument('trash');return false;" class="button red"><span>{$lang->cmd_trash}</span></a>
<a href="#" onclick="doManageDocument('delete');return false;" class="button black strong"><span>{$lang->cmd_delete}</span></a>
<a href="#" onclick="doManageDocument('move');return false;" class="button blue"><span>{$lang->cmd_move}</span></a>
<a href="#" onclick="doManageDocument('copy');return false;" class="button green"><span>{$lang->cmd_copy}</span></a>

4
modules/document/tpl/document_list.html
View file

@ -55,11 +55,15 @@
<td class="number center">{$no}</td>
<td class="center"><input type="checkbox" name="cart" value="{$oDocument->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($oDocument->isCarted())-->checked="checked"<!--@end-->/></td>
<td class="left subject">
<!--@if($oDocument->get('module_srl') != 0)-->
<!--@if($oDocument->get('module_srl')==$oDocument->get('member_srl'))-->
{$lang->cmd_save}
<!--@else-->
<a href="{getUrl('','document_srl',$oDocument->document_srl)}" onclick="window.open(this.href);return false">{$oDocument->getTitle()}</a>
<!--@end-->
<!--@else-->
[{$lang->in_trash}] {$oDocument->getTitle()}
<!--@end-->
<!--@if($oDocument->getCommentCount())-->
[{$oDocument->getCommentCount()}]

73
modules/document/tpl/document_trash_list.html Normal file
View file

@ -0,0 +1,73 @@
<!--%import("filter/delete_checked.xml")-->
<!--%import("filter/manage_checked_document.xml")-->
<!--%import("filter/restore_trash.xml")-->
<!--#include("header.html")-->
<form id="restore_form" action="./" method="post">
<input type="hidden" id="target_srl" name="target_srl" value="" />
</form>
<form id="fo_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked)">
<input type="hidden" name="page" value="{$page}" />
<!-- 모듈 선택 -->
<div class="fr">
<a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_find_module}</span></a>
<!-- <a href="{getUrl('','module','document','act','dispDocumentManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button blue"><span>{$lang->cmd_manage_document}</span></a> -->
</div>
<!-- 목록 -->
<table cellspacing="0" class="rowTable clear">
<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
<thead>
<tr>
<th scope="col"><div>{$lang->no}</div></th>
<!--<th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true }); return false;" /></div></th>-->
<th scope="col" class="wide"><div>{$lang->document}</div></th>
<th scope="col"><div>{$lang->trash_nick_name}</div></th>
<th scope="col"><div>{$lang->trash_date}</div></th>
<th scope="col"><div>{$lang->ipaddress}</div></th>
<th scope="col"><dib>{$lang->trash_description}</div></th>
<th scope="col"><div>{$lang->cmd_restore}</div></th>
</tr>
</thead>
<tbody>
<!--@foreach($document_list as $no => $oDocument)-->
<tr>
<td class="number center">{$no}</td>
<!--<td class="center"><input type="checkbox" name="cart" value="{$oDocument->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($oDocument->isCarted())-->checked="checked"<!--@end-->/></td>-->
<td class="left subject">
{$oDocument->getTitle()}
<!--@if($oDocument->getCommentCount())-->
[{$oDocument->getCommentCount()}]
<!--@end-->
<!--@if($oDocument->getTrackbackCount())-->
[{$oDocument->getTrackbackCount()}]
<!--@end-->
</td>
<td class="nowrap"><span class="member_{$oDocument->get('trash_member_srl')}">{htmlspecialchars($oDocument->get('trash_nick_name'))}</span></td>
<td class="date center nowrap">{zdate($oDocument->get('trash_date'), "Y-m-d H:i:s")}</td>
<td class="number center nowrap">{$oDocument->get('ipaddress')}</td>
<td class="left">{$oDocument->get('trash_description')}</td>
<td class="center"><a href="#" onclick="executeFilterByTargetSrl('restore_form', {$oDocument->get('trash_srl')}, restore_trash);">{$lang->cmd_restore}</a></td>
</tr>
<!--@end-->
</tbody>
</table>
</form>
<!-- 페이지 네비게이션 -->
<div class="pagination a1">
<a href="{getUrl('page','','module_srl',$module_srl)}" class="prevEnd">{$lang->first_page}</a>
<!--@while($page_no = $page_navigation->getNextPage())-->
<!--@if($page == $page_no)-->
<strong>{$page_no}</strong>
<!--@else-->
<a href="{getUrl('page',$page_no,'module_srl',$module_srl)}">{$page_no}</a>
<!--@end-->
<!--@end-->
<a href="{getUrl('page',$page_navigation->last_page,'module_srl',$module_srl)}" class="nextEnd">{$lang->last_page}</a>
</div>

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

@ -7,5 +7,6 @@
<li <!--@if($act=='dispDocumentAdminList')-->class="on"<!--@end-->><a href="{getUrl('act','dispDocumentAdminList')}">{$lang->document_list}</a></li>
<li <!--@if($act=='dispDocumentAdminConfig')-->class="on"<!--@end-->><a href="{getUrl('act','dispDocumentAdminConfig')}">{$lang->cmd_module_config}</a></li>
<li <!--@if($act=='dispDocumentAdminDeclared')-->class="on"<!--@end-->><a href="{getUrl('act','dispDocumentAdminDeclared')}">{$lang->cmd_declared_list}</a></li>
<li <!--@if($act=='dispDocumentAdminTrashList')-->class="on"<!--@end--><a href="{getUrl('act','dispDocumentAdminTrashList')}">{$lang->cmd_trash}</a></li>
</ul>
</div>

15
modules/document/tpl/js/document_admin.js
View file

@ -116,11 +116,19 @@ function insertSelectedModule(id, module_srl, mid, browser_title) {
function deleteByFilter(target_srl, filter)
{
var e = xGetElementById('target_srl');
e.value= target_srl;
e.value = target_srl;
var hF = xGetElementById("deleteForm");
procFilter(hF, filter);
}
function executeFilterByTargetSrl(form_name, target_srl, filter)
{
var e = xGetElementById('target_srl');
e.value = target_srl;
var hF = xGetElementById(form_name);
procFilter(hF, filter);
}
function doDeleteExtraKey(module_srl, var_idx) {
var fo_obj = xGetElementById('fo_delete');
fo_obj.module_srl.value = module_srl;
@ -136,3 +144,8 @@ function moveVar(type, module_srl, var_idx) {
var response_tags = new Array('error','message');
exec_xml('document','procAdminMoveExtraVar', params, function() { location.reload(); });
}
function completeRestoreTrash(ret_obj) {
alert(ret_obj['message']);
location.href = current_url;
}