diff --git a/modules/blog/blog.view.php b/modules/blog/blog.view.php
index 88fa8c7bb..274ac4f05 100644
--- a/modules/blog/blog.view.php
+++ b/modules/blog/blog.view.php
@@ -158,7 +158,7 @@
$args->sort_index = 'list_order'; ///< 소팅 값
// 목록 구함, document->getDocumentList 에서 걍 알아서 다 해버리는 구조이다... (아.. 이거 나쁜 버릇인데.. ㅡ.ㅜ 어쩔수 없다)
- $output = $oDocumentModel->getDocumentList($args);
+ $output = $oDocumentModel->getDocumentList($args, true);
// 템플릿에 쓰기 위해서 document_model::getDocumentList() 의 return object에 있는 값들을 세팅
Context::set('total_count', $output->total_count);
diff --git a/modules/blog/skins/default/comment.html b/modules/blog/skins/default/comment.html
index 25a6da86a..44d8b5dbb 100644
--- a/modules/blog/skins/default/comment.html
+++ b/modules/blog/skins/default/comment.html
@@ -1,11 +1,8 @@
-
- {$lang->comment} : {count($document->comment_list)}
-
-
+
diff --git a/modules/blog/skins/default/js/blog.js b/modules/blog/skins/default/js/blog.js
index da4dba549..591ec44da 100644
--- a/modules/blog/skins/default/js/blog.js
+++ b/modules/blog/skins/default/js/blog.js
@@ -4,6 +4,24 @@
* @brief blog 모듈의 javascript
**/
+/**
+ * 댓글 오픈
+ **/
+function doDisplayComment(document_srl) {
+ var comment_zone = xGetElementById('comment_'+document_srl);
+ if(comment_zone.style.display == "none") comment_zone.style.display = "block";
+ else comment_zone.style.display = "none";
+}
+
+/**
+ * 엮인글 오픈
+ **/
+function doDisplayTrackback(document_srl) {
+ var trackback_zone = xGetElementById('trackback_'+document_srl);
+ if(trackback_zone.style.display == "none") trackback_zone.style.display = "block";
+ else trackback_zone.style.display = "none";
+}
+
/* 글쓰기 작성후 */
function completeDocumentInserted(ret_obj) {
var error = ret_obj['error'];
diff --git a/modules/blog/skins/default/layout.html b/modules/blog/skins/default/layout.html
index ee2e10683..c5bf61653 100644
--- a/modules/blog/skins/default/layout.html
+++ b/modules/blog/skins/default/layout.html
@@ -58,8 +58,12 @@
-
+
@@ -77,16 +81,14 @@
-
-
-
-
-
-
+
+
+
+
diff --git a/modules/blog/skins/default/list.html b/modules/blog/skins/default/list.html
index 0ae35ee48..aabd135ad 100644
--- a/modules/blog/skins/default/list.html
+++ b/modules/blog/skins/default/list.html
@@ -9,29 +9,21 @@
-
-
-
-
-
[{$lang->first_page}]
+
diff --git a/modules/blog/skins/default/trackback.html b/modules/blog/skins/default/trackback.html
index c0e230f39..fe7a0af26 100644
--- a/modules/blog/skins/default/trackback.html
+++ b/modules/blog/skins/default/trackback.html
@@ -1,16 +1,11 @@
-
-
- {$lang->trackback} : {count($document->trackback_list)}
-
-
+
-
-
+
@@ -42,5 +37,5 @@
-
+
diff --git a/modules/blog/skins/default/view_document.html b/modules/blog/skins/default/view_document.html
index 481d87259..6f3d8546d 100644
--- a/modules/blog/skins/default/view_document.html
+++ b/modules/blog/skins/default/view_document.html
@@ -103,6 +103,11 @@
+
+
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index bbe03c46a..bac1249bb 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -119,7 +119,7 @@
/**
* @brief module_srl값을 가지는 문서의 목록을 가져옴
**/
- function getDocumentList($obj) {
+ function getDocumentList($obj, $get_extra_info = false) {
if(!in_array($obj->sort_index, array('list_order', 'update_order'))) $obj->sort_index = 'list_order';
@@ -234,13 +234,50 @@
$oMemberModel = &getModel('member');
$member_srl = $oMemberModel->getLoggedMemberSrl();
+ // document controller 객체 생성
+ $oDocumentController = &getController('document');
+
foreach($output->data as $key => $document) {
+ // 권한 부여
$is_granted = false;
- if($this->isGranted($document->document_srl) || $is_admin) $is_granted = true;
+ if($this->isGranted($document->document_srl)) $is_granted = true;
elseif($member_srl && $member_srl == $document->member_srl) $is_granted = true;
- $output->data[$key]->is_granted = $is_granted;
+ $document->is_granted = $is_granted;
+
+ $document_srl = $document->document_srl;
+
+ // 댓글 가져오기
+ if($document->comment_count && $document->allow_comment == 'Y') {
+ $oCommentModel = &getModel('comment');
+ $document->comment_list = $oCommentModel->getCommentList($document_srl, $is_admin);
+ }
+
+ // 트랙백 가져오기
+ if($document->trackback_count && $document->allow_trackback == 'Y') {
+ $oTrackbackModel = &getModel('trackback');
+ $document->trackback_list = $oTrackbackModel->getTrackbackList($document_srl, $is_admin);
+ }
+
+ // 첨부파일 가져오기
+ if($document->uploaded_count) {
+ $oFileModel = &getModel('file');
+ $file_list = $oFileModel->getFiles($document_srl, $is_admin);
+ $document->uploaded_list = $file_list;
+ }
+
+ // 태그 정리
+ if($document->tags) {
+ $tag_list = explode(',',$document->tags);
+ $tag_count = count($tag_list);
+ for($i=0;$i<$tag_count;$i++) if(trim($tag_list[$i])) $document->tag_list[] = trim($tag_list[$i]);
+ }
+
+ $document->content = sprintf('%s', $document_srl, $document->member_srl, $document->content, $document_srl, $document->member_srl);
+
+ $output->data[$key] = $document;
+
}
return $output;
}