Changeset 20567 for branches/version-2_5-dev/data

Timestamp:

2011/03/09 15:21:44 (13 years ago)

Author:

kimoto

Message:

list.tplに古いロジックが残っていたので修正 #1089

Location:

branches/version-2_5-dev/data

Files:

• Smarty/templates/mobile/products/list.tpl (modified) (2 diffs)
• class/SC_PageNavi.php (modified) (1 diff)
• class/pages/products/LC_Page_Products_List.php (modified) (9 diffs)

branches/version-2_5-dev/data/Smarty/templates/mobile/products/list.tpl

@@ -22 +22 @@
  */
 *}-->
-<!--{if isset($tpl_previous_page|smarty:nodefaults) || isset($tpl_next_page|smarty:nodefaults)}-->
-<!--{if isset($tpl_previous_page|smarty:nodefaults)}-->
-<a href="<!--{$tpl_previous_page|h}-->">前へ</a>
-<!--{/if}-->
-<!--{if isset($tpl_previous_page|smarty:nodefaults) && isset($tpl_next_page|smarty:nodefaults)}-->
-｜
-<!--{/if}-->
-<!--{if isset($tpl_next_page|smarty:nodefaults)}-->
-<a href="<!--{$tpl_next_page|h}-->">次へ</a>
-<!--{/if}-->
+<!--{if $tpl_strnavi != "&nbsp;"}-->
+<!--{$tpl_strnavi}-->
 <br><br>
 <!--{/if}-->
@@ -66 +58 @@
 <!--{/foreach}-->
 
-<!--{if isset($tpl_previous_page|smarty:nodefaults) || isset($tpl_next_page|smarty:nodefaults)}-->
-<!--{if isset($tpl_previous_page|smarty:nodefaults)}-->
-<a href="<!--{$tpl_previous_page|h}-->">前へ</a>
+<!--{if $tpl_strnavi != "&nbsp;"}-->
+<!--{$tpl_strnavi}-->
+<br><br>
 <!--{/if}-->
-<!--{if isset($tpl_previous_page|smarty:nodefaults) && isset($tpl_next_page|smarty:nodefaults)}-->
-｜
-<!--{/if}-->
-<!--{if isset($tpl_next_page|smarty:nodefaults)}-->
-<a href="<!--{$tpl_next_page|h}-->">次へ</a>
-<!--{/if}-->
-<br>
-<!--{/if}-->

branches/version-2_5-dev/data/class/SC_PageNavi.php

@@ -137 +137 @@
             }
 
-            if ($before || $next) {
+            if ($before && $next) {
                 $this->strnavi = $before .(($display_number) ? $page_number : ' | ') .$next;
+            } else if ($before || $next) {
+                $this->strnavi = $before .(($display_number) ? $page_number : '') .$next;
             }
         } else {

branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php

@@ -124 +124 @@
         $this->tpl_linemax = $this->lfGetProductAllNum($arrSearchCondition);
         $urlParam = "category_id={$this->arrSearchData['category_id']}&pageno=#page#";
-        $this->objNavi = new SC_PageNavi_Ex($this->tpl_pageno, $this->tpl_linemax, $this->disp_number, 'fnNaviPage', NAVI_PMAX, $urlParam,SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE);
-        $this->arrProducts = $this->lfGetProductsList($arrSearchCondition,$this->disp_number,$this->objNavi->start_row,$this->tpl_linemax,$objProduct);
+        $this->objNavi = new SC_PageNavi_Ex($this->tpl_pageno, $this->tpl_linemax, $this->disp_number, 'fnNaviPage', NAVI_PMAX, $urlParam, SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE);
+        $this->arrProducts = $this->lfGetProductsList($arrSearchCondition, $this->disp_number, $this->objNavi->start_row, $this->tpl_linemax, $objProduct);
         //商品一覧の表示処理
         $strnavi = $this->objNavi->strnavi;
@@ -314 +314 @@
         // 規格を設定
         $objProduct->setProductsClassByProductIds($arrProduct_id);
-        $arrProducts += array('productStatus'=>$objProduct->getProductStatus($arrProduct_id));     
+        $arrProducts += array('productStatus'=>$objProduct->getProductStatus($arrProduct_id));
         return $arrProducts;
     }
@@ -358 +358 @@
      *
      * @return str
-     */    
+     */
     function lfGetPageTitle($mode,$category_id = 0){
         if ($mode == 'search') {
@@ -368 +368 @@
             return $arrCat['name'];
         }
-        return "";       
+        return "";
     }
 
@@ -375 +375 @@
      *
      * @return array
-     */    
+     */
     function lfGetSearchConditionDisp($arrSearchData){
         $objQuery =& SC_Query_Ex::getSingletonInstance();
@@ -400 +400 @@
      *
      * @return int
-     */    
+     */
     function lfGetProductAllNum($searchCondition){
         // 検索結果対象となる商品の数を取得
@@ -413 +413 @@
      *
      * @return array
-     */    
+     */
     function lfGetSearchCondition($arrSearchData){
         $searchCondition = array(
@@ -468 +468 @@
      *
      * @return str
-     */   
+     */
     function lfSetSelectedData(&$arrProducts,$arrForm,$arrErr,$product_id){
         $js_fnOnLoad = "";
@@ -488 +488 @@
      *
      * @return void
-     */   
+     */
     function lfAddCart($arrForm, $referer){
         $product_class_id = $arrForm['product_class_id'];