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

modules/member/member.controller.php

@@ -506,19 +506,13 @@
 
             // 전체 가입항목 목록을 구한다
             $join_form_list = $oMemberModel->getJoinFormList();
-            if(count($join_form_list->data)) {
+            $join_form_srl_list = array_keys($join_form_list);
-                foreach($join_form_list->data as $key => $val) {
-                    $join_form_srl_list[] = $val->member_join_form_srl;
-                }
-            }
             if(count($join_form_srl_list)<2) return new Object();
 
-            $prev_category = NULL;
+            $prev_member_join_form = NULL;
-            if(count($join_form_list->data)) {
+            foreach($join_form_list as $key => $val) {
-                foreach($join_form_list->data as $key => $val) {
+                if($val->member_join_form_srl == $member_join_form_srl) break;
-                    if($val->member_join_form_srl == $member_join_form_srl) break;
+                $prev_member_join_form = $val;
-                    $prev_member_join_form = $val;
-                }
             }
 
             // 이전 가입항목가 없으면 그냥 return
@@ -527,13 +521,16 @@
             // 선택한 가입항목의 정보
             $cur_args->member_join_form_srl = $member_join_form_srl;
             $cur_args->list_order = $prev_member_join_form->list_order;
-            $output = $oDB->executeQuery('member.updateMemberJoinFormListorder', $cur_args);
-            if(!$output->toBool()) return $output;
 
             // 대상 가입항목의 정보
             $prev_args->member_join_form_srl = $prev_member_join_form->member_join_form_srl;
             $prev_args->list_order = $list_order;
-            $oDB->executeQuery('member.updateMemberJoinFormListorder', $cur_args);
+
+            // DB 처리
+            $output = $oDB->executeQuery('member.updateMemberJoinFormListorder', $cur_args);
+            if(!$output->toBool()) return $output;
+
+            $oDB->executeQuery('member.updateMemberJoinFormListorder', $prev_args);
             if(!$output->toBool()) return $output;
 
             return new Object();
@@ -556,11 +553,7 @@
 
             // 전체 가입항목 목록을 구한다
             $join_form_list = $oMemberModel->getJoinFormList();
-            if(count($join_form_list->data)) {
+            $join_form_srl_list = array_keys($join_form_list);
-                foreach($join_form_list->data as $key => $val) {
-                    $join_form_srl_list[] = $val->member_join_form_srl;
-                }
-            }
             if(count($join_form_srl_list)<2) return new Object();
 
             for($i=0;$i<count($join_form_srl_list);$i++) {
@@ -571,23 +564,21 @@
 
             // 이전 가입항목가 없으면 그냥 return
             if(!$next_member_join_form_srl) return new Object();
-            foreach($join_form_list->data as $key => $val) {
+            $next_member_join_form = $join_form_list[$next_member_join_form_srl];
-                if($val->member_join_form_srl == $next_member_join_form_srl) {
-                    $next_member_join_form = $val;
-                    break;
-                }
-            }
 
             // 선택한 가입항목의 정보
             $cur_args->member_join_form_srl = $member_join_form_srl;
             $cur_args->list_order = $next_member_join_form->list_order;
-            $output = $oDB->executeQuery('member.updateMemberJoinFormListorder', $cur_args);
-            if(!$output->toBool()) return $output;
 
             // 대상 가입항목의 정보
             $next_args->member_join_form_srl = $next_member_join_form->member_join_form_srl;
             $next_args->list_order = $list_order;
-            $oDB->executeQuery('member.updateMemberJoinFormListorder', $cur_args);
+
+            // DB 처리
+            $output = $oDB->executeQuery('member.updateMemberJoinFormListorder', $cur_args);
+            if(!$output->toBool()) return $output;
+
+            $output = $oDB->executeQuery('member.updateMemberJoinFormListorder', $next_args);
             if(!$output->toBool()) return $output;
 
             return new Object();

modules/member/member.model.php

@@ -204,12 +204,18 @@
             $oDB = &DB::getInstance();
 
             $args->sort_index = "list_order";
-            $args->page = Context::get('page');
-            $args->list_count = 40;
-            $args->page_count = 10;
-
             $output = $oDB->executeQuery('member.getJoinFormList', $args);
-            return $output;
+            $join_form_list = $output->data;
+
+            if(!$join_form_list) return NULL;
+
+            if(!is_array($join_form_list)) $join_form_list = array($join_form_list);
+            $join_form_count = count($join_form_list);
+            for($i=0;$i<$join_form_count;$i++) {
+                $member_join_form_srl = $join_form_list[$i]->member_join_form_srl;
+                $list[$member_join_form_srl] = $join_form_list[$i];
+            }
+            return $list;
         }
 
         /**

modules/member/member.view.php

@@ -101,13 +101,8 @@
             $oMemberModel = &getModel('member');
 
             // 사용금지 목록 가져오기
-            $output = $oMemberModel->getJoinFormList();
+            $form_list = $oMemberModel->getJoinFormList();
-
+            Context::set('form_list', $form_list);
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
-            Context::set('form_list', $output->data);
-            Context::set('page_navigation', $output->page_navigation);
 
             $this->setTemplateFile('join_form_list');
         }

modules/member/queries/getJoinFormList.xml

@@ -7,8 +7,5 @@
   </columns>
   <navigation>
     <index var="sort_index" default="list_order" order="asc" />
-    <list_count var="list_count" default="20" />
-    <page_count var="page_count" default="10" />
-    <page var="page" default="1" />
   </navigation>
 </query>

modules/member/tpl.admin/join_form_list.html

@@ -7,17 +7,10 @@
 <input type="hidden" name="mode" value="" />
 </form>
 
-<!-- 정보 -->
-<div>
-  {number_format($total_count)}, 
-  {$lang->page_count} : {number_format($page)} / {number_format($total_page)}
-</div>
-
 <!-- 목록 -->
 <div>
   <table>
   <tr>
-    <th>{$lang->no}</th>
     <th>{$lang->column_type}</th>
     <th>{$lang->column_title}</th>
     <th>{$lang->column_name}</th>
@@ -28,7 +21,6 @@
   </tr>
   <!--@foreach($form_list as $no => $val)-->
   <tr>
-    <td>{$no}</td>
     <td>{$lang->column_type_list[$val->column_type]}</td>
     <td>{$val->column_title}</td>
     <td>{$val->column_name}</td>
@@ -48,18 +40,3 @@
   [<a href="#" onclick="location.href='{getUrl('act','dispInsertJoinForm')}';return false;">{$lang->cmd_make}</a>]
 
 </div>
-
-<!-- 페이지 네비게이션 -->
-<div>
-  <a href="{getUrl('page','','member_srl','')}">[{$lang->first_page}]</a>
-
-  <!--@while($page_no = $page_navigation->getNextPage())-->
-    <!--@if($page == $page_no)-->
-      {$page_no}
-    <!--@else-->
-      <a href="{getUrl('page',$page_no,'member_srl','')}">[{$page_no}]</a>
-    <!--@end-->
-  <!--@end-->
-
-  <a href="{getUrl('page',$page_navigation->last_page,'member_srl','')}">[{$lang->last_page}]</a>
-</div>