Changeset 20775

Timestamp:

2011/03/23 19:13:40 (12 years ago)

Author:

nanasess

bzr:base-revision:

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

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/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

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110323101228-2pxfzd4z8b2eu02o

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110323101327-lvu0ztom4b6v0fez

bzr:revno:

3488

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/admin/design/main_edit.tpl ohkouchi@loop-az.jp-20110323101228-2pxfzd4z8b2eu02o
data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php ohkouchi@loop-az.jp-20110323101228-2pxfzd4z8b2eu02o

bzr:timestamp:

2011-03-23 19:13:27.331000090 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-03-23T10:13:27.331000Z

Message:

#1192 (管理画面 -> デザイン管理 -> ページ詳細設定 で登録を行うとシステムエラー)

• header_chk, footer_chk が正しく扱われるよう修正

Location:

branches/version-2_5-dev/data

Files:

• Smarty/templates/admin/design/main_edit.tpl (modified) (1 diff)
• class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php (modified) (3 diffs)

branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl

@@ -84 +84 @@
         <tr>
             <td colspan="2">
-                <label for="header-chk"><input type="checkbox" name="header_chk" id="header-chk" <!--{if $arrPageData.header_chk != "2"}-->checked="checked"<!--{/if}--> />共通のヘッダーを使用する</label>&nbsp;
-                <label for="footer-chk"><input type="checkbox" name="footer_chk" id="footer-chk" <!--{if $arrPageData.footer_chk != "2"}-->checked="checked"<!--{/if}--> />共通のフッターを使用する</label>
+                <label for="header-chk"><input type="checkbox" name="header_chk" id="header-chk" value="1" <!--{if $arrPageData.header_chk == "1"}-->checked="checked"<!--{/if}--> />共通のヘッダーを使用する</label>&nbsp;
+                <label for="footer-chk"><input type="checkbox" name="footer_chk" id="footer-chk" value="1" <!--{if $arrPageData.footer_chk == "1"}-->checked="checked"<!--{/if}--> />共通のフッターを使用する</label>
                 <div>
                     <textarea id="tpl_data" class="top" name="tpl_data" rows=<!--{$text_row}--> style="width: 98%;"><!--{$arrPageData.tpl_data|h|smarty:nodefaults}--></textarea>

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

@@ -178 +178 @@
                 $_POST['page_name'],
                 USER_DIR . $_POST['url'],
-                $_POST['header_chk'],
-                $_POST['footer_chk']
+                intval($_POST['header_chk']) === 1 ? 1 : 2,
+                intval($_POST['footer_chk']) === 1 ? 1 : 2
             );
             $page_id = $arrTmp['page_id'];
@@ -206 +206 @@
             // エラーがあれば入力時のデータを表示する
             $this->arrPageData = $_POST;
-            $this->arrPageData['header_chk'] = SC_Utils_Ex::sfChangeCheckBox(SC_Utils_Ex::sfChangeCheckBox($_POST['header_chk']), true);
-            $this->arrPageData['footer_chk'] = SC_Utils_Ex::sfChangeCheckBox(SC_Utils_Ex::sfChangeCheckBox($_POST['footer_chk']), true);
             $this->arrPageData['directory'] = '';
             $this->arrPageData['filename'] = $_POST['url'];
@@ -268 +266 @@
     function lfGetUpdData($device_type_id, $page_id, $page_name, $filename, $header_chk, $footer_chk) {
         $arrUpdData = array(
-            'header_chk'    => SC_Utils_Ex::sfChangeCheckBox($header_chk),  // ヘッダー使用
-            'footer_chk'    => SC_Utils_Ex::sfChangeCheckBox($footer_chk),  // フッター使用
+            'header_chk'    => $header_chk,  // ヘッダー使用
+            'footer_chk'    => $footer_chk,  // フッター使用
             'update_url'    => $_SERVER['HTTP_REFERER'],                    // 更新URL
             'update_date'   => 'now()',