Changeset 19725 for branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php

Timestamp:

2010/12/15 18:06:23 (13 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19724

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/admin/design/bloc.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fbloc.tpl
data/Smarty/templates/admin/design/css.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fcss.tpl
data/class/SC_View.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_View.php
data/class/helper/SC_Helper_PageLayout.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_PageLayout.php
data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php 15687@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Bloc.php
data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php 15689@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_CSS.php
data/class/pages/admin/design/LC_Page_Admin_Design_Header.php 15688@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Header.php
data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php 15682@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_MainEdit.php
data/class/pages/admin/design/LC_Page_Admin_Design_Template.php 16430@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Template.php

bzr:mapping-version:

v4

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20101215090611-0mqtkfcbju06ba0c

bzr:revno:

2454

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:timestamp:

2010-12-15 18:06:11.522000074 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2010-12-15T09:06:11.522000Z

Message:

#748(モバイル/スマートフォンのデザイン管理)

• テンプレートの取得方法を修正

File:

• branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php (modified) (7 diffs)

branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php

@@ -71 +71 @@
      */
     function action() {
-        $this->objLayout = new SC_Helper_PageLayout_Ex();
-        $package_path = USER_TEMPLATE_PATH . "/" . TEMPLATE_NAME . "/";
 
         // 認証可否の判定
@@ -94 +92 @@
         }
 
+        $this->objLayout = new SC_Helper_PageLayout_Ex();
+        $package_path = $this->objLayout->getTemplatePath($device_type_id, true);
+
         // ブロック一覧を取得
         $this->arrBlocList = $this->lfgetBlocData("device_type_id = ?", array($device_type_id));
@@ -108 +109 @@
             // 存在しない場合は指定テンプレートのブロックを取得
             } else {
-                $arrBlocData[0]['tpl_path'] = TEMPLATE_DIR . $arrBlocData[0]['tpl_path'];
+                $arrBlocData[0]['tpl_path'] = $this->objLayout->getTemplatePath($device_type_id) . $arrBlocData[0]['tpl_path'];
             }
 
@@ -150 +151 @@
             if (count($this->arrErr) == 0) {
                 // DBへデータを更新する
-                $this->lfEntryBlocData($_POST);
+                $this->lfEntryBlocData($_POST, $device_type_id);
 
                 // 旧ファイルの削除
@@ -248 +249 @@
      *
      * @param array $arrData 更新データ
+     * @param integer $device_type_id 端末種別ID
      * @return integer 更新結果
      */
-    function lfEntryBlocData($arrData){
+    function lfEntryBlocData($arrData, $device_type_id){
         $objQuery = new SC_Query();     // DB操作オブジェクト
         $sql = "";                      // データ更新SQL生成用
@@ -258 +260 @@
 
         // 更新データ生成
-        $arrUpdData = array($arrData['bloc_name'], BLOC_DIR . $arrData['filename'] . '.tpl', $arrData['filename']);
+        $arrUpdData = array("bloc_name" => $arrData['bloc_name'],
+                            "tpl_path" => BLOC_DIR . $arrData['filename'] . '.tpl',
+                            "filename" => $arrData['filename']);
 
         // データが存在しているかチェックを行う
         if($arrData['bloc_id'] !== ''){
             $arrChk = $this->lfgetBlocData("bloc_id = ? AND device_type_id = ?",
-                                           array($arrData['bloc_id'], $arrData['device_type_id']));
+                                           array($arrData['bloc_id'], $device_type_id));
         }
 
@@ -271 +275 @@
             // FIXME device_type_id ごとの連番にする
             $arrUpdData['bloc_id'] = $objQuery->nextVal('dtb_bloc_bloc_id');
+            $arrUpdData['device_type_id'] = $device_type_id;
             $arrUpdData['create_date'] = "now()";
             $ret = $objQuery->insert('dtb_bloc', $arrUpdData);
         } else {
             $ret = $objQuery->update('dtb_bloc', $arrUpdData, 'bloc_id = ? AND device_type_id = ?',
-                                     array($arrData['bloc_id'], $arrData['device_type_id']));
+                                     array($arrData['bloc_id'], $device_type_id));
         }
         return $ret;