diff --git a/modules/editor/skins/xeed/js/xeed.js b/modules/editor/skins/xeed/js/xeed.js
index a728a7d7f..97c38bc5a 100644
--- a/modules/editor/skins/xeed/js/xeed.js
+++ b/modules/editor/skins/xeed/js/xeed.js
@@ -839,7 +839,6 @@ Block = xe.createPlugin('BlockCommand', {
if (!sel) return false;
nodes = this.getBlockParents();
- console.log(nodes);
n = parseInt(params[0], 10);
for(i=0,c=nodes.length; i
- 접기
-
+ 접기/펼치기
+
{@$item = $value2}
diff --git a/modules/module/tpl/js/module_admin.js b/modules/module/tpl/js/module_admin.js
index e7e1423ee..be37c3374 100644
--- a/modules/module/tpl/js/module_admin.js
+++ b/modules/module/tpl/js/module_admin.js
@@ -6,7 +6,6 @@
/* 모듈 즐겨찾기 */
function doToggleFavoriteModule(obj, module_name) {
function on_complete(data){
- console.log(data);
if (data.result == 'on')
jQuery(obj).removeClass('fvOff').addClass('fvOn').html(xe.lang.favorite_on);
else
diff --git a/modules/trash/tpl/js/trash_admin.js b/modules/trash/tpl/js/trash_admin.js
index b151253b7..25d02ca93 100644
--- a/modules/trash/tpl/js/trash_admin.js
+++ b/modules/trash/tpl/js/trash_admin.js
@@ -36,7 +36,7 @@ function getTrashList()
{
var trashListTable = jQuery('#trashListTable');
var cartList = [];
- trashListTable.find(':checkbox[name=cart').each(function(){
+ trashListTable.find(':checkbox[name=cart]').each(function(){
if(this.checked) cartList.push(this.value);
});
diff --git a/modules/trash/tpl/trash_list.html b/modules/trash/tpl/trash_list.html
index 3aee23922..1b9aa080c 100644
--- a/modules/trash/tpl/trash_list.html
+++ b/modules/trash/tpl/trash_list.html
@@ -82,13 +82,14 @@ var confirm_restore_msg = '{$lang->confirm_restore}';
+
선택한 글 관리
- 선택한 글 8
+ 선택한 글 0
- | {$lang->document} ({$lang->trash_type}) |
+ {$lang->document} |
{$lang->trash_nick_name} |
{$lang->ipaddress} |
diff --git a/modules/trash/trash.admin.controller.php b/modules/trash/trash.admin.controller.php
index 945f06b75..60ec85c5d 100644
--- a/modules/trash/trash.admin.controller.php
+++ b/modules/trash/trash.admin.controller.php
@@ -39,6 +39,7 @@ class trashAdminController extends trash
{
global $lang;
$isAll = Context::get('is_all');
+ $originModule = Context::get('origin_module');
$tmpTrashSrls = Context::get('cart');
if(is_array($tmpTrashSrls)) $trashSrls = $tmpTrashSrls;
else $trashSrls = explode('|@|', $tmpTrashSrls);
@@ -51,7 +52,7 @@ class trashAdminController extends trash
$this->setMessage('success_deleted', 'info');
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
- $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminList');
+ $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminList', 'origin_module', $originModule);
$this->setRedirectUrl($returnUrl);
return;
}