From 6a322a17cedfbe651f514e08fc4c46d3d7b554d2 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 4 Dec 2007 08:25:54 +0000
Subject: [PATCH] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D=20=EC=B6=94=EC=B6=9C=EC=8B=9C=20=EA=B3=B5=EC=A7=80?=
 =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EC=A0=9C=EC=99=B8=20=EC=B6=94=EC=B6=9C?=
 =?UTF-8?q?=ED=95=A0=EB=95=8C=20php=EC=BD=94=EB=93=9C=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=9D=B4=EB=A5=BC=20=EC=B2=98=EB=A6=AC=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=ED=95=98=EC=97=AC=20db=20=EC=BF=BC=EB=A6=AC=20?=
 =?UTF-8?q?=EC=86=8D=EB=8F=84=20=EB=B9=A0=EB=A5=B4=EA=B2=8C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3153 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/document/document.model.php | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index 726381860..78e83467b 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -139,7 +139,7 @@
             $args->page_count = $obj->page_count?$obj->page_count:10;
             $args->start_date = $obj->start_date?$obj->start_date:null;
             $args->end_date = $obj->end_date?$obj->end_date:null;
-            if($except_notice) $args->s_is_notice = 'N';
+            //if($except_notice) $args->s_is_notice = 'N';
 
             $query_id = 'document.getDocumentList';
 
@@ -241,15 +241,29 @@
             // 결과가 없거나 오류 발생시 그냥 return
             if(!$output->toBool()||!count($output->data)) return $output;
 
-            foreach($output->data as $key => $attribute) {
-                $document_srl = $attribute->document_srl;
+            $idx = 0;
+            $data = $output->data;
+            unset($output->data);
 
+            $keys = array_keys($data);
+            $virtual_number = $keys[0];
+
+            if($except_notice) {
+                foreach($data as $key => $attribute) {
+                    if($attribute->is_notice == 'Y') $virtual_number --;
+                }
+            }
+
+            foreach($data as $key => $attribute) {
+                if($except_notice && $attribute->is_notice == 'Y') continue;
+                $document_srl = $attribute->document_srl;
                 $oDocument = null;
                 $oDocument = new documentItem();
                 $oDocument->setAttribute($attribute);
                 if($is_admin) $oDocument->setGrant();
 
-                $output->data[$key] = $oDocument;
+                $output->data[$virtual_number] = $oDocument;
+                $virtual_number --;
             
             }
             return $output;