Author: adrianc
Date: Sun Nov 20 13:44:33 2011
New Revision: 1204170
URL:
http://svn.apache.org/viewvc?rev=1204170&view=revLog:
Fixed bug in htmlFormMacroLibrary.ftl - list navigation page size drop-down was ignoring the current setting.
Modified:
ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1204170&r1=1204169&r2=1204170&view=diff==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Sun Nov 20 13:44:33 2011
@@ -691,9 +691,9 @@ Parameter: lastViewName, String, optiona
<li class="${paginateNextStyle}<#if highIndex lt listSize>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxNextUrl}')<#else>${nextUrl}</#if>">${paginateNextLabel}</a><#else>-disabled"><span>${paginateNextLabel}</span></#if></li>
<li class="${paginateLastStyle}<#if highIndex lt listSize>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxLastUrl}')<#else>${lastUrl}</#if>">${paginateLastLabel}</a><#else>-disabled"><span>${paginateLastLabel}</span></#if></li>
<#if javaScriptEnabled><li class="nav-pagesize"><select name="pageSize" size="1" onchange="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxSelectSizeUrl}')<#else>location.href='${selectSizeUrl}';</#if>"><#rt/>
-<#assign availPageSizes = [20, 30, 50, 100, 200]>
+<#assign availPageSizes = [viewSize, 20, 30, 50, 100, 200]>
<#list availPageSizes as ps>
- <option <#if viewSize == ps>selected="selected" </#if> value="${ps}">${ps}</option>
+ <option<#if viewSize == ps> selected="selected" </#if> value="${ps}">${ps}</option>
</#list>
</select> ${paginateViewSizeLabel}</li></#if>
<li class="nav-displaying">${commonDisplaying}</li>