Merge pull request #449 from sejin7940/master

휴지통(trash) 목록의 View 화면을 만들어보았습니다.
This commit is contained in:
akasima 2014-03-03 14:55:00 +09:00
commit cc12862286
6 changed files with 175 additions and 1 deletions

View file

@ -11,6 +11,8 @@
<action name="procTrashAdminEmptyTrash" type="controller" ruleset="emptyTrash" />
<action name="procTrashAdminRestore" type="controller" />
<action name="procTrashAdminGetList" type="controller" />
<action name="dispTrashAdminView" type="view" />
</actions>
<menus>
<menu name="trash">

View file

@ -83,4 +83,36 @@
<value xml:lang="en"><![CDATA[Remove all trash items. After execute could not be recovered.]]></value>
<value xml:lang="jp"><![CDATA[ゴミ箱を完全に消去します。実行後には復元できません。]]></value>
</item>
<item name="title">
<value xml:lang="ko"><![CDATA[제목]]></value>
<value xml:lang="en"><![CDATA[Subject]]></value>
<value xml:lang="jp"><![CDATA[タイトル]]></value>
<value xml:lang="zh-TW"><![CDATA[標題]]></value>
</item>
<item name="content">
<value xml:lang="ko"><![CDATA[내용]]></value>
<value xml:lang="en"><![CDATA[Content]]></value>
<value xml:lang="jp"><![CDATA[内容]]></value>
<value xml:lang="zh-TW"><![CDATA[內容]]></value>
</item>
<item name="trasher">
<value xml:lang="ko"><![CDATA[삭제자]]></value>
<value xml:lang="en"><![CDATA[Deleter]]></value>
<value xml:lang="jp"><![CDATA[削除者]]></value>
<value xml:lang="zh-TW"><![CDATA[刪除]]></value>
</item>
<item name="origin_info">
<value xml:lang="ko"><![CDATA[원문 정보]]></value>
<value xml:lang="en"><![CDATA[Document Info]]></value>
</item>
<item name="delete_info">
<value xml:lang="ko"><![CDATA[삭제 정보]]></value>
<value xml:lang="en"><![CDATA[Trash Info]]></value>
</item>
<item name="cmd_restore">
<value xml:lang="ko"><![CDATA[복원]]></value>
<value xml:lang="en"><![CDATA[Restore]]></value>
<value xml:lang="jp"><![CDATA[復元]]></value>
<value xml:lang="zh-TW"><![CDATA[復原]]></value>
</item>
</lang>

View file

@ -0,0 +1,32 @@
<query id="getDocumentExtraVars" action="select">
<tables>
<table name="document_extra_keys" alias="extra_keys" />
<table name="document_extra_vars" alias="extra_vars" type="left join">
<conditions>
<condition operation="equal" column="extra_keys.module_srl" default="extra_vars.module_srl" />
<condition operation="equal" column="extra_keys.eid" default="extra_vars.eid" pipe="and" />
</conditions>
</table>
</tables>
<columns>
<column name="extra_keys.module_srl" alias="module_srl" />
<column name="extra_keys.var_name" alias="name" />
<column name="extra_keys.var_type" alias="type" />
<column name="extra_keys.var_is_required" alias="is_required" />
<column name="extra_keys.var_search" alias="search" />
<column name="extra_keys.var_default" alias="default" />
<column name="extra_keys.var_desc" alias="desc" />
<column name="extra_keys.var_idx" alias="idx" />
<column name="extra_vars.document_srl" alias="document_srl" />
<column name="extra_vars.lang_code" alias="lang_code" />
<column name="extra_vars.value" alias="value" />
<column name="extra_keys.eid" alias="eid" />
</columns>
<conditions>
<condition operation="equal" column="extra_keys.module_srl" var="module_srl" />
<condition operation="in" column="extra_vars.document_srl" var="document_srl" pipe="and" />
</conditions>
<navigation>
<index var="sort_index" default="extra_keys.var_idx" order="asc" />
</navigation>
</query>

View file

@ -41,7 +41,7 @@ var no_text_comment = '{$lang->no_text_comment}';
<tr loop="$trash_list => $no, $oTrashVO">
<td class="title">
<strong cond="!trim($oTrashVO->getTitle()) && $oTrashVO->getOriginModule() == 'comment'">{$lang->no_text_comment}</strong>
<block cond="trim($oTrashVO->getTitle())">{$oTrashVO->getTitle()}</block>
<block cond="trim($oTrashVO->getTitle())"><a href="{getUrl('act','dispTrashAdminView','trash_srl',$oTrashVO->getTrashSrl())}">{$oTrashVO->getTitle()}</a></block>
</td>
<td class="nowr"><!--@if($oTrashVO->getOriginModule() == 'document')-->{$lang->document}<!--@else-->{$lang->comment}<!--@end--></td>
<td class="nowr"><a href="#popup_menu_area" class="member_{$oTrashVO->getRemoverSrl()}">{$oTrashVO->getNickName()}</a></td>

View file

@ -0,0 +1,81 @@
<div class="x_page-header">
<h1>{$lang->cmd_trash} {$lang->trash_description}</h1>
</div>
<h2>{$lang->delete_info}</h2>
<table class="x_table x_table-striped x_table-hover">
<col width="120">
<tr>
<th scope="col" class="nowr">{$lang->trasher}</th>
<td>
{@
$oMemberModel = &getModel('member');
$remover_info = $oMemberModel->getMemberInfoByMemberSrl($oTrashVO->getRemoverSrl());
}
{htmlspecialchars($remover_info->nick_name)} <a href="#popup_menu_area" class="member_{$oTrashVO->getRemoverSrl()}" onclick="return false">[{$remover_info->user_id}]</a>
</td>
</tr>
<tr>
<th scope="col" class="nowr">{$lang->trash_date}</th>
<td>{zdate($oTrashVO->getRegdate(), "Y-m-d H:i:s")}</td>
</tr>
<tr>
<th scope="row">{$lang->trash_description}</th>
<td class="text">{$oTrashVO->getDescription()}</td>
</tr>
</table>
<br>
<h2>{$lang->origin_info}</h2>
<table class="x_table x_table-striped x_table-hover">
<col width="120">
<tr>
<th scope="row">{$lang->module}</th>
<td class="text">
{@
$oModuleModel = &getModel('module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($oOrigin->module_srl);
}
{$module_info->browser_title} ({$module_info->mid})
</td>
</tr>
<tr>
<th scope="row">{$lang->title}</th>
<td class="text">{$oOrigin->title}</td>
</tr>
<tr>
<th scope="row">{$lang->writer}</th>
<td class="text">{htmlspecialchars($oOrigin->nick_name)} <a href="#popup_menu_area" class="member_{$oOrigin->member_srl}" onclick="return false">[{$oOrigin->user_id}]</a></td>
</tr>
<tr>
<th scope="row">{$lang->regdate}</th>
<td class="text">{zdate($oOrigin->regdate,'Y.m.d H:i:s')}</td>
</tr>
<block loop="$oOriginExtraVars=>$key,$val">
<tr><th>{$val->name}</th>
<td>{$val->value}</td>
</tr>
</block>
<tr>
<th scope="row">{$lang->content}</th>
<td class="text">{$oOrigin->content}</td>
</tr>
</table>
<form action="./" method="post">
<input type="hidden" name="module" value="trash" />
<input type="hidden" name="act" value="procTrashAdminEmptyTrash" />
<input type="hidden" name="page" value="{$page}" />
<input type="hidden" name="is_all" value="false" />
<input type="hidden" name="origin_module" value="{$oTrashVO->getOriginModule()}" />
<input type="hidden" name="cart[]" value="{$oTrashVO->getTrashSrl()}" />
<div class="x_pull-left"><button class="x_btn" type="button" onclick="history.go(-1)">{$lang->cmd_list}</button></div>
<div class="x_pull-right">
<button type="submit" name="is_all" class="x_btn" value="false">{$lang->cmd_delete}</button>
<button type="submit" name="act" class="x_btn x_btn-primary" value="procTrashAdminRestore">{$lang->cmd_restore}</button>
</div>
</form>

View file

@ -51,6 +51,33 @@ class trashAdminView extends trash
// 템플릿 파일 지정
$this->setTemplateFile('trash_list');
}
// Trash View - sejin7940
function dispTrashAdminView()
{
$trash_srl = Context::get('trash_srl');
$oTrashModel = getModel('trash');
$output = $oTrashModel->getTrash($trash_srl);
if(!$output->data->getTrashSrl()) return new Object(-1, 'msg_invalid_request');
$originObject = unserialize($output->data->getSerializedObject());
if(is_array($originObject)) $originObject = (object)$originObject;
Context::set('oTrashVO',$output->data);
Context::set('oOrigin',$originObject);
if($originObject) {
$args_extra->module_srl = $originObject->module_srl;
$args_extra->document_srl = $originObject->document_srl;
$output_extra = executeQueryArray('trash.getDocumentExtraVars', $args_extra);
Context::set('oOriginExtraVars',$output_extra->data);
}
$this->setTemplateFile('trash_view');
}
}
/* End of file trash.admin.view.php */
/* Location: ./modules/trash/trash.admin.view.php */