Skip to content

Commit

Permalink
Merge pull request EC-CUBE#496 from nanasess/fix-paging
Browse files Browse the repository at this point in the history
ページング処理に nofilter を付与
  • Loading branch information
matsuoshi authored Nov 16, 2021
2 parents 12d231c + da40dbc commit 261ef5d
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion data/Smarty/templates/admin/contents/recommend_search.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function func_submit( id ){
<!--{* ▼検索結果表示 *}-->
<!--{if is_numeric($tpl_linemax)}-->
<p><!--{$tpl_linemax}-->件が該当しました。</p>
<!--{$tpl_strnavi}-->
<!--{$tpl_strnavi nofilter}-->
<table id="recommend-search-results" class="list">
<col width="15%" />
Expand Down
2 changes: 1 addition & 1 deletion data/Smarty/templates/admin/customer/search_customer.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function func_submit(customer_id){
<!--{if $smarty.post.mode == 'search'}-->
<!--▼検索結果表示-->
<!--{if $tpl_linemax > 0}-->
<p><!--{$tpl_linemax}-->件が該当しました。<!--{$tpl_strnavi}--></p>
<p><!--{$tpl_linemax}-->件が該当しました。<!--{$tpl_strnavi nofilter}--></p>
<!--{/if}-->
<!--▼検索後表示部分-->
Expand Down
2 changes: 1 addition & 1 deletion data/Smarty/templates/admin/order/product_select.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
<!--{if $tpl_linemax}-->
<p>
<!--{$tpl_linemax}-->件が該当しました。
<!--{$tpl_strnavi}-->
<!--{$tpl_strnavi nofilter}-->
</p>

<!--▼検索後表示部分-->
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/order/status.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

<p class="remark">
<!--{$tpl_linemax}-->件が該当しました。
<!--{$tpl_strnavi}-->
<!--{$tpl_strnavi nofilter}-->
</p>

<table class="list">
Expand Down Expand Up @@ -102,7 +102,7 @@
<!--{/section}-->
</table>

<p><!--{$tpl_strnavi}--></p>
<p><!--{$tpl_strnavi nofilter}--></p>

<!--{elseif $arrStatus != "" & $tpl_linemax == 0}-->
<div class="message">
Expand Down
2 changes: 1 addition & 1 deletion data/Smarty/templates/admin/products/product_rank.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

<p class="remark"><span class="attention"><!--{$tpl_linemax}-->件</span>が該当しました。</p>
<div class="pager">
<!--{$tpl_strnavi}-->
<!--{$tpl_strnavi nofilter}-->
</div>

<!--{if $smarty.const.ADMIN_MODE == '1'}-->
Expand Down
2 changes: 1 addition & 1 deletion data/Smarty/templates/admin/products/product_select.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function func_submit( id ){
<!--{if $tpl_linemax}-->
<p><!--{$tpl_linemax}-->件が該当しました。</p>
<!--{* ▼ページナビ *}-->
<!--{$tpl_strnavi}-->
<!--{$tpl_strnavi nofilter}-->
<!--{* ▲ページナビ *}-->
<!--{* ▼検索後表示部分 *}-->
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/system/index.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<div id="system" class="contents-main">
<div class="paging">
<!--▼ページ送り-->
<!--{$tpl_strnavi}-->
<!--{$tpl_strnavi nofilter}-->
<!--▲ページ送り-->
</div>

Expand Down Expand Up @@ -73,7 +73,7 @@

<div class="paging">
<!--▼ページ送り-->
<!--{$tpl_strnavi}-->
<!--{$tpl_strnavi nofilter}-->
<!--▲ページ送り-->
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion data/Smarty/templates/default/mypage/favorite.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<p><span class="attention"><!--{$tpl_linemax}-->件</span>のお気に入りがあります。</p>
<div class="paging">
<!--▼ページナビ-->
<!--{$tpl_strnavi}-->
<!--{$tpl_strnavi nofilter}-->
<!--▲ページナビ-->
</div>

Expand Down
2 changes: 1 addition & 1 deletion data/Smarty/templates/default/mypage/index.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<p><span class="attention"><!--{$objNavi->all_row}-->件</span>の購入履歴があります。</p>
<div class="pagenumber_area">
<!--▼ページナビ-->
<!--{$objNavi->strnavi}-->
<!--{$objNavi->strnavi nofilter}-->
<!--▲ページナビ-->
</div>

Expand Down
2 changes: 1 addition & 1 deletion data/Smarty/templates/default/products/list.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<!--{/foreach}-->
</select>
</div>
<div class="navi"><!--{$tpl_strnavi}--></div>
<div class="navi"><!--{$tpl_strnavi nofilter}--></div>
</div>
<!--{/capture}-->
<!--▲ページナビ(本文)-->
Expand Down
2 changes: 1 addition & 1 deletion data/Smarty/templates/mobile/mypage/index.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<!--{/if}-->

<!--{if $objNavi->strnavi != ""}-->
<!--{$objNavi->strnavi}-->
<!--{$objNavi->strnavi nofilter}-->
<br>
<!--{/if}-->
<!--{/strip}-->
4 changes: 2 additions & 2 deletions data/Smarty/templates/mobile/products/list.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<!--{strip}-->
<!--{if $tpl_strnavi != "&nbsp;"}-->
<!--{$tpl_strnavi}-->
<!--{$tpl_strnavi nofilter}-->
<br><br>
<!--{/if}-->

Expand All @@ -51,7 +51,7 @@
<!--{/foreach}-->

<!--{if $tpl_strnavi != "&nbsp;"}-->
<!--{$tpl_strnavi}-->
<!--{$tpl_strnavi nofilter}-->
<br><br>
<!--{/if}-->
<!--{/strip}-->

0 comments on commit 261ef5d

Please sign in to comment.