[Svn-src-all:1515] [version-2_5-dev 20411] refs #1058
shutta
admin ＠ mail.ec-cube.net
2011年 2月 25日 (金) 21:44:59 JST
Subversion committed to /home/svn/open 20411
http://svn.ec-cube.net/open_trac/changeset/20411
┌────────────────────────────┐
│更新者 : shutta │
│更新日時: 2011-02-25 21:44:58 +0900 (金, 25 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
refs #1058
mtb_page_rowsの廃止
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/Smarty/templates/admin/customer/index.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl
U branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php
U branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php
U branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
U branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
U branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
U branches/version-2_5-dev/html/install/sql/drop_table.sql
U branches/version-2_5-dev/html/install/sql/insert_data.sql
変更: branches/version-2_5-dev/data/Smarty/templates/admin/customer/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/index.tpl 2011-02-25 11:30:43 UTC (rev 20410)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/index.tpl 2011-02-25 12:44:58 UTC (rev 20411)
@@ -71,8 +71,8 @@
</table>
<div class="btn">
<p class="page_rows">検索結果表示件数
- <select name="search_page_rows">
- <!--{html_options options=$arrPageRows selected=$arrForm.search_page_rows}-->
+ <select name="search_page_max">
+ <!--{html_options options=$arrPageRows selected=$arrForm.search_page_max}-->
</select> 件</p>
<div class="btn-area">
<ul>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl 2011-02-25 11:30:43 UTC (rev 20410)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl 2011-02-25 12:44:58 UTC (rev 20411)
@@ -50,7 +50,7 @@
<div class="btn">
<p class="page_rows">検索結果表示件数
- <!--{assign var=key value="search_page_rows"}-->
+ <!--{assign var=key value="search_page_max"}-->
<select name="<!--{$key}-->">
<!--{html_options options=$arrPageRows selected=$arrForm[$key]}-->
</select> 件</p>
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php 2011-02-25 11:30:43 UTC (rev 20410)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php 2011-02-25 12:44:58 UTC (rev 20411)
@@ -493,7 +493,7 @@
$objFormParam->addParam('登録・更新日(終了年)', 'search_end_year', 4, 'n', array("NUM_CHECK","MAX_LENGTH_CHECK"));
$objFormParam->addParam('登録・更新日(終了月)', 'search_end_month', 2, 'n', array("NUM_CHECK","MAX_LENGTH_CHECK"));
$objFormParam->addParam('登録・更新日(終了日)', 'search_end_day', 2, 'n', array("NUM_CHECK","MAX_LENGTH_CHECK"));
- $objFormParam->addParam('表示件数', 'search_page_rows', INT_LEN, 'n', array("NUM_CHECK","MAX_LENGTH_CHECK"), 1, false);
+ $objFormParam->addParam('表示件数', 'search_page_max', INT_LEN, 'n', array("NUM_CHECK","MAX_LENGTH_CHECK"), 1, false);
$objFormParam->addParam('ページ番号', 'search_pageno', INT_LEN, 'n', array("NUM_CHECK","MAX_LENGTH_CHECK"), 1, false);
$objFormParam->addParam('最終購入日(開始年)', 'search_buy_start_year', 4, 'n', array("NUM_CHECK","MAX_LENGTH_CHECK"));
$objFormParam->addParam('最終購入日(開始月)', 'search_buy_start_month', 2, 'n', array("NUM_CHECK","MAX_LENGTH_CHECK"));
@@ -560,7 +560,7 @@
function sfGetSearchData($arrParam) {
$objQuery =& SC_Query::getSingletonInstance();
$objSelect = new SC_CustomerList($arrParam, "customer");
- $page_max = SC_Utils_Ex::sfGetSearchPageMax($arrParam['search_page_rows']);
+ $page_max = SC_Utils_Ex::sfGetSearchPageMax($arrParam['search_page_max']);
$disp_pageno = $arrParam['search_pageno'];
if($disp_pageno == 0) {
$disp_pageno = 1;
変更: branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php 2011-02-25 11:30:43 UTC (rev 20410)
+++ branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php 2011-02-25 12:44:58 UTC (rev 20411)
@@ -55,7 +55,7 @@
$this->arrJob = $masterData->getMasterData("mtb_job");
$this->arrJob["不明"] = "不明";
$this->arrSex = $masterData->getMasterData("mtb_sex");
- $this->arrPageRows = $masterData->getMasterData("mtb_page_rows");
+ $this->arrPageRows = $masterData->getMasterData("mtb_page_max");
$this->arrStatus = $masterData->getMasterData("mtb_customer_status");
$this->arrMagazineType = $masterData->getMasterData("mtb_magazine_type");
変更: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php 2011-02-25 11:30:43 UTC (rev 20410)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php 2011-02-25 12:44:58 UTC (rev 20411)
@@ -55,7 +55,7 @@
$this->arrJob = $masterData->getMasterData("mtb_job");
$this->arrJob["不明"] = "不明";
$this->arrSex = $masterData->getMasterData("mtb_sex");
- $this->arrPageRows = $masterData->getMasterData("mtb_page_rows");
+ $this->arrPageRows = $masterData->getMasterData("mtb_page_max");
$this->arrHtmlmail = array( "" => "両方", 1 => "HTML", 2 => "TEXT" );
$this->arrMailType = $masterData->getMasterData("mtb_mail_type");
変更: branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/create_table_mysql.sql 2011-02-25 11:30:43 UTC (rev 20410)
+++ branches/version-2_5-dev/html/install/sql/create_table_mysql.sql 2011-02-25 12:44:58 UTC (rev 20411)
@@ -983,13 +983,6 @@
PRIMARY KEY (id)
) ENGINE=InnoDB;
-CREATE TABLE mtb_page_rows (
- id smallint,
- name text,
- rank smallint NOT NULL DEFAULT 0,
- PRIMARY KEY (id)
-) ENGINE=InnoDB;
-
CREATE TABLE mtb_mail_type (
id smallint,
name text,
変更: branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql 2011-02-25 11:30:43 UTC (rev 20410)
+++ branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql 2011-02-25 12:44:58 UTC (rev 20411)
@@ -983,13 +983,6 @@
PRIMARY KEY (id)
);
-CREATE TABLE mtb_page_rows (
- id smallint,
- name text,
- rank smallint NOT NULL DEFAULT 0,
- PRIMARY KEY (id)
-);
-
CREATE TABLE mtb_mail_type (
id smallint,
name text,
変更: branches/version-2_5-dev/html/install/sql/drop_table.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/drop_table.sql 2011-02-25 11:30:43 UTC (rev 20410)
+++ branches/version-2_5-dev/html/install/sql/drop_table.sql 2011-02-25 12:44:58 UTC (rev 20411)
@@ -56,7 +56,6 @@
DROP TABLE mtb_product_status_color;
DROP TABLE mtb_product_list_max;
DROP TABLE mtb_permission;
-DROP TABLE mtb_page_rows;
DROP TABLE mtb_page_max;
DROP TABLE mtb_order_status_color;
DROP TABLE mtb_order_status;
変更: branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/insert_data.sql 2011-02-25 11:30:43 UTC (rev 20410)
+++ branches/version-2_5-dev/html/install/sql/insert_data.sql 2011-02-25 12:44:58 UTC (rev 20411)
@@ -832,17 +832,6 @@
INSERT INTO mtb_page_max (id, name, rank) VALUES (90, '90', 8);
INSERT INTO mtb_page_max (id, name, rank) VALUES (100, '100', 9);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (10, '10', 0);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (20, '20', 1);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (30, '30', 2);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (40, '40', 3);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (50, '50', 4);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (60, '60', 5);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (70, '70', 6);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (80, '80', 7);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (90, '90', 8);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (100, '100', 9);
-
INSERT INTO mtb_permission (id, name, rank) VALUES ('/admin/system/index.php', '0', 0);
INSERT INTO mtb_permission (id, name, rank) VALUES ('/admin/system/delete.php', '0', 1);
INSERT INTO mtb_permission (id, name, rank) VALUES ('/admin/system/input.php', '0', 2);
Svn-src-all メーリングリストの案内