Index: /branches/version-2_5-dev/html/user_data/packages/admin/js/admin.js
===================================================================
--- /branches/version-2_5-dev/html/user_data/packages/admin/js/admin.js	(revision 19769)
+++ /branches/version-2_5-dev/html/user_data/packages/admin/js/admin.js	(revision 19977)
@@ -119,14 +119,4 @@
 }
 
-// ラジオボタンに変更があったか判定する。
-function fnChangeRadio(name, no, id, pageno) {
-	// 最初の取得状態から変更ありの場合
-	if(lstsave[name] != no) {
-		// DB反映ページ実行
-		url = "./check.php?id=" + id + "&no=" + no + "&pageno=" + pageno;
-		location.href = url;
-	}
-}
-
 // 管理者メンバーページの切替
 function fnMemberPage(pageno) {
Index: anches/version-2_5-dev/html/admin/system/check.php
===================================================================
--- /branches/version-2_5-dev/html/admin/system/check.php	(revision 19943)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
- *		check.php 稼働・非稼働の切替
- */
-require_once("../require.php");
-
-$conn = new SC_DbConn();
-
-// 認証可否の判定
-$objSess = new SC_Session();
-SC_Utils_Ex::sfIsSuccess($objSess);
-
-// GET値の正当性を判定する
-if(SC_Utils_Ex::sfIsInt($_GET['id']) && ($_GET['no'] == 1 || $_GET['no'] == 0)){
-	$sqlup = "UPDATE dtb_member SET work = ? WHERE member_id = ?";
-	$conn->query($sqlup, array($_GET['no'], $_GET['id']));
-} else {
-	// エラー処理
-	gfPrintLog("error id=".$_GET['id']);
-}
-
-// ページの表示
-$location = "Location: " . ADMIN_SYSTEM_URLPATH . "?pageno=".$_GET['pageno'];
-header($location);
-?>
Index: /branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php	(revision 19943)
+++ /branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php	(revision 19977)
@@ -156,5 +156,7 @@
 
         $this->insertMemberData($this->objForm->getHashArray());
-        $this->objDisplay->reload(array('mode' => 'parent_reload'));
+        // 親ウィンドウを更新後、自ウィンドウを閉じる。
+        $url = ADMIN_SYSTEM_URLPATH . "?pageno=" . $_POST['pageno'];
+        $this->tpl_onload = "fnUpdateParent('".$url."'); window.close();";
     }
 
@@ -178,4 +180,5 @@
         }
         $objForm->addParam('権限', 'authority', INT_LEN, '', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
+        $objForm->addParam('稼働/非稼働', 'work', INT_LEN, '', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
 
         $objForm->setParam($_POST);
@@ -324,5 +327,5 @@
     function getMemberData($id) {
         $table   = 'dtb_member';
-        $columns = 'name,department,login_id,authority';
+        $columns = 'name,department,login_id,authority, work';
         $where   = 'member_id = ?';
 
@@ -369,5 +372,5 @@
         $sqlVal['authority']   = $arrMemberData['authority'];
         $sqlVal['rank']        = $objQuery->max('rank', 'dtb_member') + 1;
-        $sqlVal['work']        = '1'; // 稼働に設定
+        $sqlVal['work']        = $arrMemberData['work'];
         $sqlVal['del_flg']     = '0'; // 削除フラグをOFFに設定
         $sqlVal['creator_id']  = $_SESSION['member_id'];
@@ -395,4 +398,5 @@
         $sqlVal['login_id']    = $arrMemberData['login_id'];
         $sqlVal['authority']   = $arrMemberData['authority'];
+        $sqlVal['work']   = $arrMemberData['work'];
         $sqlVal['update_date'] = 'NOW()';
         if($arrMemberData['password'] != DUMMY_PASS) {
Index: /branches/version-2_5-dev/data/Smarty/templates/admin/system/index.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/admin/system/index.tpl	(revision 19965)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/system/index.tpl	(revision 19977)
@@ -35,6 +35,4 @@
     <colgroup width="20%">
     <colgroup width="20%">
-    <colgroup width="10%">
-    <colgroup width="10%">
     <colgroup width="5%">
     <colgroup width="5%">
@@ -47,6 +45,4 @@
       <th>名前</th>
       <th>所属</th>
-      <th>稼動</th>
-      <th>非稼動</th>
       <th>編集</th>
       <th>削除</th>
@@ -58,6 +54,4 @@
       <td><!--{$list_data[data].name|h}--></td>
       <td><!--{$list_data[data].department|h}--></td>
-      <td align="center"><!--{if $list_data[data].work eq 1}--><input type="radio" name="radio<!--{$smarty.section.data.iteration}-->" value="稼動" onclick="fnChangeRadio(this.name, 1, <!--{$list_data[data].member_id}-->, <!--{$tpl_disppage}-->);" checked /><!--{else}--><input type="radio" name="radio<!--{$smarty.section.data.iteration}-->" value="稼動" onclick="fnChangeRadio(this.name, 1, <!--{$list_data[data].member_id}-->, <!--{$tpl_disppage}-->);"/><!--{/if}--></td>
-      <td align="center"><!--{if $list_data[data].work eq 0}--><input type="radio" name="radio<!--{$smarty.section.data.iteration}-->" value="非稼動"  onclick="fnChangeRadio(this.name, 0, <!--{$list_data[data].member_id}-->, <!--{$tpl_disppage}-->);" checked /><!--{else}--><input type="radio" name="radio<!--{$smarty.section.data.iteration}-->" value="非稼動" onclick="fnChangeRadio(this.name, 0, <!--{$list_data[data].member_id}-->, <!--{$tpl_disppage}-->);" <!--{if $workmax <= 1 }-->disabled<!--{/if}-->  /><!--{/if}--></td>
       <td align="center"><a href="#" onClick="win01('./input.php?id=<!--{$list_data[data].member_id}-->&amp;pageno=<!--{$tpl_disppage}-->','member_edit','615','450'); return false;">編集</a></td>
       <td align="center"><!--{if $workmax > 1 }--><a href="#" onClick="fnDeleteMember(<!--{$list_data[data].member_id}-->,<!--{$tpl_disppage}-->); return false;">削除</a><!--{else}-->-<!--{/if}--></td>
Index: /branches/version-2_5-dev/data/Smarty/templates/admin/system/input.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/admin/system/input.tpl	(revision 19965)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/system/input.tpl	(revision 19977)
@@ -85,4 +85,14 @@
     </td>
   </tr>
+  <tr>
+    <th>稼働/非稼働</th>
+    <td>
+      <!--{if $arrErr.work}--><span class="attention"><!--{$arrErr.work}--></span><!--{/if}-->
+      <!--{assign var=key value="work"}-->
+      <input type="radio" id="<!--{$key}-->_1" name="<!--{$key}-->" value="1" style="<!--{$arrErr.work|sfGetErrorColor}-->" <!--{$arrForm.work|sfGetChecked:1}--> /><label for="<!--{$key}-->_1">稼働</label>
+      <input type="radio" id="<!--{$key}-->_0" name="<!--{$key}-->" value="0" style="<!--{$arrErr.work|sfGetErrorColor}-->" <!--{$arrForm.work|sfGetChecked:0}--> /><label for="<!--{$key}-->_0">非稼働</label>
+      <span class="attention">※必須入力</span>
+    </td>
+  </tr>
 </table>