Changeset 20847 for branches/version-2_11-dev/data/class/helper/SC_Helper_PageLayout.php

Timestamp:

2011/04/15 22:58:24 (13 years ago)

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/admin/design/main_edit.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fmain_edit.tpl
data/class/helper/SC_Helper_FileManager.php 16253@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_FileManager.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_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/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php
test/class/util/SC_Utils_Test.php sc_utils_test.php-20100802013957-750m2yralg9cowkd-1

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110415135459-j12posg14af2xtbu

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110415135820-5xdfd57eknr425dj

bzr:revno:

3558

bzr:revprop:branch-nick:

branches/version-2_11-dev

bzr:root:

branches/version-2_11-dev

bzr:text-revisions:

data/Smarty/templates/admin/design/main_edit.tpl ohkouchi@loop-az.jp-20110415135459-j12posg14af2xtbu
data/class/helper/SC_Helper_FileManager.php ohkouchi@loop-az.jp-20110415135459-j12posg14af2xtbu
data/class/helper/SC_Helper_PageLayout.php ohkouchi@loop-az.jp-20110415135459-j12posg14af2xtbu
test/class/util/SC_Utils_Test.php ohkouchi@loop-az.jp-20110415135459-j12posg14af2xtbu

bzr:timestamp:

2011-04-15 22:58:20.900000095 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-04-15T13:58:20.900000Z

Message:

#972 (リファクタリング開発：[管理画面]デザイン管理)

• ページ詳細設定

File:

• branches/version-2_11-dev/data/class/helper/SC_Helper_PageLayout.php (modified) (3 diffs)

branches/version-2_11-dev/data/class/helper/SC_Helper_PageLayout.php

@@ -58 +58 @@
             $arrPageData = $this->getPageProperties($device_type_id, 0);
         }
+
         $objPage->tpl_mainpage = $this->getTemplatePath($device_type_id) . $arrPageData[0]['filename'] . ".tpl";
         $objPage->arrPageLayout =& $arrPageData[0];
@@ -185 +186 @@
         if ($page_id != '') {
             $arrPageData = $this->getPageProperties($device_type_id, $page_id);
-            // SQL実行
             $ret = $objQuery->delete("dtb_pagelayout", "page_id = ? AND device_type_id = ?", array($page_id, $device_type_id));
-
             // ファイルの削除
             $this->lfDelFile($arrPageData[0]['filename'], $device_type_id);
@@ -207 +206 @@
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
-        // 同名ファイルの使用件数
+        /*
+         * 同名ファイルの使用件数
+         * PHP ファイルは, 複数のデバイスで共有するため, device_type_id を条件に入れない
+         */
         $count = $objQuery->count('dtb_pagelayout', 'filename = ?', array($filename));