git-svn-id: http://xe-core.googlecode.com/svn/trunk@703 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/document/document.model.php

@@ -117,8 +117,17 @@
 
             if(!in_array($obj->sort_index, array('list_order', 'update_order'))) $obj->sort_index = 'list_order';
 
-            // 변수 설정
-            $args->module_srl = $obj->module_srl;
+            // 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->category_srl = $obj->category_srl?$obj->category_srl:'';
 
             $args->sort_index = $obj->sort_index;

modules/document/queries/getDocumentList.xml

@@ -6,7 +6,7 @@
     <column name="*" />
   </columns>
   <conditions>
-    <condition operation="equal" column="module_srl" var="module_srl" filter="number" />
+    <condition operation="in" column="module_srl" var="module_srl" filter="number" />
     <condition operation="equal" column="category_srl" var="category_srl" pipe="and" />
     <group pipe="and">
       <condition operation="like" column="title" var="s_title" />

modules/editor/components/image_gallery/tpl/slide_gallery.js

@@ -109,7 +109,6 @@ function display_gallery_image(obj, is_first_display) {
     // 이미지 표시 
     var target_image = xGetElementById("slide_gallery_main_image_"+obj.srl);
 
-    target_image.style.margin = "0px;";
     target_image.style.marginLeft = x+"px";
 
     target_image.src = obj.image.src;

modules/file/tpl.admin/file_list.html

@@ -33,7 +33,7 @@
     <td>{$val->download_count}</td>
     <td>{zdate($val->regdate,"Y-m-d")}</td>
     <td>{$val->ipaddress}</td>
-    <td><a href="#" onclick="window.open('./?document_srl={$val->document_srl}');return false">{$lang->cmd_move}</a></td>
+    <td><a href="#" onclick="window.open('./?document_srl={$val->upload_target_srl}');return false">{$lang->cmd_move}</a></td>
     <td><a href="{$val->download_url}">{$lang->cmd_download}</a></td>
   </tr>
   <!--@end-->

modules/module/module.model.php

@@ -126,6 +126,23 @@
             return $mid_list;
         }
 
+        /**
+         * @brief mid 목록에 대응하는 module_srl을 배열로 return
+         **/
+        function getModuleSrlByMid($mid) {
+            if(is_array($mid)) $mid = "'".implode("','",$mid)."'";
+            $oDB = &DB::getInstance();
+            $args->mid = $mid;
+            $output = $oDB->executeQuery('module.getModuleSrlByMid', $args);
+            if(!$output->toBool()) return $output;
+
+            $list = $output->data;
+            if(!$list) return;
+            if(!is_array($list)) $list = array($list);
+            foreach($list as $key => $val) $module_srl_list[] = $val->module_srl;
+            return $module_srl_list;
+        }
+
         /**
          * @brief 특정 모듈의 스킨의 정보를 구해옴
          **/

modules/module/queries/getModuleSrlByMid.xml

@@ -0,0 +1,11 @@
+<query id="getModuleSrlByMid" action="select">
+  <tables>
+    <table name="modules" />
+  </tables>
+  <columns>
+    <column name="module_srl" />
+  </columns>
+  <conditions>
+    <condition operation="in" column="mid" var="mid" notnull="notnull" />
+  </conditions>
+</query>