From 315345a566915cac101963f33253b4f130c620e2 Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Wed, 27 Apr 2011 08:46:43 +0000
Subject: [PATCH] #19705602 specify db table column parameter in layout module

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8342 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/layout/layout.admin.view.php | 6 ++++--
 modules/layout/layout.model.php      | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/layout/layout.admin.view.php b/modules/layout/layout.admin.view.php
index 0e3e72c01..cf80565ba 100644
--- a/modules/layout/layout.admin.view.php
+++ b/modules/layout/layout.admin.view.php
@@ -19,7 +19,8 @@
          **/
         function dispLayoutAdminContent() {
             $oLayoutModel = &getModel('layout');
-            $layout_list = $oLayoutModel->getLayoutList();
+			$columnList = array('layout_srl', 'layout', 'module_srl', 'title', 'regdate');
+            $layout_list = $oLayoutModel->getLayoutList(0, 'P', $columnList);
             Context::set('layout_list', $layout_list);
 
             $this->setTemplateFile('index');
@@ -27,7 +28,8 @@
 
 		function dispLayoutAdminMobileContent() {
             $oLayoutModel = &getModel('layout');
-            $layout_list = $oLayoutModel->getLayoutList(0, "M");
+			$columnList = array('layout_srl', 'layout', 'module_srl', 'title', 'regdate');
+            $layout_list = $oLayoutModel->getLayoutList(0, 'M', $columnList);
             Context::set('layout_list', $layout_list);
 
             $this->setTemplateFile('mindex');
diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php
index e7b19b8bd..60afb28fe 100644
--- a/modules/layout/layout.model.php
+++ b/modules/layout/layout.model.php
@@ -19,14 +19,14 @@
          * @brief Get a layout list created in the DB
          * If you found a new list, it means that the layout list is inserted to the DB
          **/
-        function getLayoutList($site_srl = 0, $layout_type="P") {
+        function getLayoutList($site_srl = 0, $layout_type="P", $columnList = array()) {
             if(!$site_srl) {
                 $site_module_info = Context::get('site_module_info');
                 $site_srl = (int)$site_module_info->site_srl;
             }
             $args->site_srl = $site_srl;
 			$args->layout_type = $layout_type;
-            $output = executeQuery('layout.getLayoutList', $args);
+            $output = executeQuery('layout.getLayoutList', $args, $columnList);
             if(!$output->data) return;
             if(is_array($output->data)) return $output->data;
             return array($output->data);