Changeset 18842 for branches/version-2_5-dev/data/class/pages/admin/contents

Timestamp:

2010/10/02 13:05:28 (14 years ago)

Author:

Seasoft

Message:

#824(CSV出力項目設定の並び順変更で異常表示)改修

• jquery.multiselect2side を利用

File:

• branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php (modified) (3 diffs)

branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php

@@ -71 +71 @@
         SC_Utils_Ex::sfIsSuccess($objSess);
 
-        $arrOutput = array();
-        $arrChoice = array();
-
         $get_tpl_subno_csv = isset($_GET['tpl_subno_csv'])
                                      ? $_GET['tpl_subno_csv'] : "";
@@ -118 +115 @@
 
         // 出力項目の取得
-        $arrOutput = SC_Utils_Ex::sfSwapArray($objCSV->sfgetCsvOutput($subno_id, 'status = 1'));
-        $arrOutput = SC_Utils_Ex::sfarrCombine($arrOutput['no'], $arrOutput['disp_name']);
+        $arrSelected = SC_Utils_Ex::sfSwapArray($objCSV->sfgetCsvOutput($subno_id, 'status = 1'));
+
+        if (!isset($arrSelected['no'])) $arrSelected['no'] = array();
+        if (!isset($arrSelected['disp_name'])) $arrSelected['disp_name'] = array();
+
+        $this->arrSelected = $arrSelected['no'];
 
         // 非出力項目の取得
@@ -127 +128 @@
         if (!isset($arrChoice['disp_name'])) $arrChoice['disp_name'] = array();
 
-        $arrChoice = SC_Utils_Ex::sfarrCombine($arrChoice['no'], $arrChoice['disp_name']);
+        $arrOptions = array_merge(
+            SC_Utils_Ex::sfarrCombine($arrSelected['no'], $arrSelected['disp_name']),
+            SC_Utils_Ex::sfarrCombine($arrChoice['no'], $arrChoice['disp_name'])
+        );
 
-        $this->arrOutput=$arrOutput;
-        $this->arrChoice=$arrChoice;
-
+        $this->arrOptions = $arrOptions;
 
         $this->SubnaviName = $this->arrSubnaviName[$subno_id];