[Svn-src-all:1488] [version-2_5-dev 20380] refs #642
shutta
admin ＠ mail.ec-cube.net
2011年 2月 24日 (木) 17:49:36 JST
Subversion committed to /home/svn/open 20380
http://svn.ec-cube.net/open_trac/changeset/20380
┌────────────────────────────┐
│更新者 : shutta │
│更新日時: 2011-02-24 17:49:36 +0900 (木, 24 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
refs #642
SEARCH_PMAXの関係する表示件数取得処理を共通化
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php
U branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php
U branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php
U branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php
U branches/version-2_5-dev/data/class/util/SC_Utils.php
変更: 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-24 08:01:40 UTC (rev 20379)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php 2011-02-24 08:49:36 UTC (rev 20380)
@@ -559,12 +559,7 @@
function sfGetSearchData($arrParam) {
$objQuery =& SC_Query::getSingletonInstance();
$objSelect = new SC_CustomerList($arrParam, "customer");
- $page_rows = $arrParam['search_page_rows'];
- if(SC_Utils_Ex::sfIsInt($page_rows)) {
- $page_max = $page_rows;
- }else{
- $page_max = SEARCH_PMAX;
- }
+ $page_max = SC_Utils_Ex::sfGetSearchPageMax($arrParam['search_page_rows']);
$disp_pageno = $arrParam['search_pageno'];
if($disp_pageno == 0) {
$disp_pageno = 1;
変更: branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php 2011-02-24 08:01:40 UTC (rev 20379)
+++ branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php 2011-02-24 08:49:36 UTC (rev 20380)
@@ -84,7 +84,7 @@
$order = "update_date DESC, product_id DESC";
list($where, $arrval) = $this->getSearchParam($objDb,$arrPost,$where);
$linemax = $this->getLineCount($where, $arrval);
- $page_max = $this->setPageMax($arrPost['search_page_max']);
+ $page_max = SC_Utils_Ex::sfGetSearchPageMax($arrPost['search_page_max']);
// ページ送りの取得
$objNavi = new SC_PageNavi($arrPost['search_pageno'], $linemax, $page_max, "fnNaviSearchOnlyPage", NAVI_PMAX);
@@ -186,20 +186,6 @@
}
/**
- * @param $search_page_max
- * @return string
- */
- function setPageMax($search_page_max){
- // ページ送りの処理
- if(isset($search_page_max) && is_numeric($search_page_max)) {
- $page_max = $search_page_max;
- } else {
- $page_max = SEARCH_PMAX;
- }
- return $page_max;
- }
-
- /**
* 指定された条件の商品データを取得する。
* @param Object $objQuery ObjQueryオブジェクト
* @param Array $arrval 検索パラメータ
変更: branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php 2011-02-24 08:01:40 UTC (rev 20379)
+++ branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php 2011-02-24 08:49:36 UTC (rev 20380)
@@ -148,7 +148,7 @@
// 行数の取得
$this->tpl_linemax = $this->getNumberOfLines($where, $arrval);
// ページ送りの処理
- $page_max = $this->getPageMax($objFormParam);
+ $page_max = SC_Utils_Ex::sfGetSearchPageMax($objFormParam->getValue('search_page_max'));
// ページ送りの取得
$objNavi = new SC_PageNavi($this->arrHidden['search_pageno'],
$this->tpl_linemax, $page_max,
@@ -451,24 +451,6 @@
}
/**
- * 最大表示件数を取得する.
- *
- * フォームの入力値から最大表示件数を取得する.
- * 取得できなかった場合は, 定数 SEARCH_PMAX の値を返す.
- *
- * @param SC_FormParam $objFormParam SC_FormParam インスタンス
- * @return integer 最大表示件数
- */
- function getPageMax(&$objFormParam) {
- $page_max = $objFormParam->getValue('search_page_max');
- if(is_numeric($page_max)) {
- return $page_max;
- } else {
- return SEARCH_PMAX;
- }
- }
-
- /**
* 受注を検索する.
*
* @param string $where 検索条件の WHERE 句
変更: branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php 2011-02-24 08:01:40 UTC (rev 20379)
+++ branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php 2011-02-24 08:49:36 UTC (rev 20380)
@@ -89,12 +89,7 @@
//ぶった斬りポイント==================================================================
// ページ送りの処理
- if(isset($_POST['search_page_max'])
- && is_numeric($_POST['search_page_max'])) {
- $page_max = $_POST['search_page_max'];
- } else {
- $page_max = SEARCH_PMAX;
- }
+ $page_max = SC_Utils_Ex::sfGetSearchPageMax($_POST['search_page_max']);
// ページ送りの取得
$objNavi = new SC_PageNavi($_POST['search_pageno'], $this->tpl_linemax, $page_max, "fnNaviSearchOnlyPage", NAVI_PMAX);
変更: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php 2011-02-24 08:01:40 UTC (rev 20379)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php 2011-02-24 08:49:36 UTC (rev 20380)
@@ -150,7 +150,7 @@
// 行数の取得
$this->tpl_linemax = $this->getNumberOfLines($where, $arrval);
// ページ送りの処理
- $page_max = $this->getPageMax($objFormParam);
+ $page_max = SC_Utils_Ex::sfGetSearchPageMax($objFormParam->getValue('search_page_max'));
// ページ送りの取得
$objNavi = new SC_PageNavi($this->arrHidden['search_pageno'],
$this->tpl_linemax, $page_max,
@@ -361,24 +361,6 @@
}
/**
- * 最大表示件数を取得する.
- *
- * フォームの入力値から最大表示件数を取得する.
- * 取得できなかった場合は, 定数 SEARCH_PMAX の値を返す.
- *
- * @param SC_FormParam $objFormParam SC_FormParam インスタンス
- * @return integer 最大表示件数
- */
- function getPageMax(&$objFormParam) {
- $page_max = $objFormParam->getValue('search_page_max');
- if(is_numeric($page_max)) {
- return $page_max;
- } else {
- return SEARCH_PMAX;
- }
- }
-
- /**
* 商品を検索する.
*
* @param string $where 検索条件の WHERE 句
@@ -402,4 +384,4 @@
return $objQuery->select($col, $from, $where, $arrValues);
}
}
-?>
\ No newline at end of file
+?>
変更: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php 2011-02-24 08:01:40 UTC (rev 20379)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php 2011-02-24 08:49:36 UTC (rev 20380)
@@ -171,12 +171,7 @@
$this->tpl_linemax = $linemax; // 何件が該当しました。表示用
// ページ送りの処理
- if(isset($_POST['search_page_max'])
- && is_numeric($_POST['search_page_max'])) {
- $page_max = $_POST['search_page_max'];
- } else {
- $page_max = SEARCH_PMAX;
- }
+ $page_max = SC_Utils_Ex::sfGetSearchPageMax($_POST['search_page_max']);
// ページ送りの取得
$objNavi = new SC_PageNavi($_POST['search_pageno'], $linemax, $page_max, "fnNaviSearchOnlyPage", NAVI_PMAX);
変更: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php 2011-02-24 08:01:40 UTC (rev 20379)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php 2011-02-24 08:49:36 UTC (rev 20380)
@@ -340,11 +340,7 @@
$objQuery =& SC_Query::getSingletonInstance();
// ページ送りの処理
- if(is_numeric($arrForm['search_page_max'])) {
- $page_max = $arrForm['search_page_max'];
- } else {
- $page_max = SEARCH_PMAX;
- }
+ $page_max = SC_Utils_Ex::sfGetSearchPageMax($arrForm['search_page_max']);
if (!isset($arrval)) $arrval = array();
変更: branches/version-2_5-dev/data/class/util/SC_Utils.php
===================================================================
--- branches/version-2_5-dev/data/class/util/SC_Utils.php 2011-02-24 08:01:40 UTC (rev 20379)
+++ branches/version-2_5-dev/data/class/util/SC_Utils.php 2011-02-24 08:49:36 UTC (rev 20380)
@@ -2292,6 +2292,23 @@
return $res;
}
+ /**
+ * 検索結果の1ページあたりの最大表示件数を取得する
+ *
+ * フォームの入力値から最大表示件数を取得する
+ * 取得できなかった場合は, 定数 SEARCH_PMAX の値を返す
+ *
+ * @param string $search_page_max 表示件数の選択値
+ * @return integer 1ページあたりの最大表示件数
+ */
+ function sfGetSearchPageMax($search_page_max) {
+ if (SC_Utils_Ex::sfIsInt($search_page_max) && $search_page_max > 0) {
+ $page_max = intval($search_page_max);
+ } else {
+ $page_max = SEARCH_PMAX;
+ }
+ return $page_max;
+ }
}
?>
Svn-src-all メーリングリストの案内