Changeset 615


Ignore:
Timestamp:
Jun 28, 2010, 12:28:00 AM (15 years ago)
Author:
gav
Message:

Fix NPE during pagination after setSearchParamsMax in search views.

Location:
trunk/grails-app
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified trunk/grails-app/controllers/AssetDetailedController.groovy

    r459 r615  
    2424    def setSearchParamsMax = {
    2525        def max = 1000
    26         if(params.newMax.isInteger()) {
     26        if(params.newMax?.isInteger()) {
    2727            def i = params.newMax.toInteger()
    2828            if(i > 0 && i <= max)
  • TabularUnified trunk/grails-app/controllers/AssetSubItemDetailedController.groovy

    r403 r615  
    2222    def setSearchParamsMax = {
    2323        def max = 1000
    24         if(params.newMax.isInteger()) {
     24        if(params.newMax?.isInteger()) {
    2525            def i = params.newMax.toInteger()
    2626            if(i > 0 && i <= max)
  • TabularUnified trunk/grails-app/controllers/InventoryItemDetailedController.groovy

    r566 r615  
    2626    def setSearchParamsMax = {
    2727        def max = 1000
    28         if(params.newMax.isInteger()) {
     28        if(params.newMax?.isInteger()) {
    2929            def i = params.newMax.toInteger()
    3030            if(i > 0 && i <= max)
  • TabularUnified trunk/grails-app/controllers/InventoryItemPurchaseDetailedController.groovy

    r614 r615  
    2121    def setSearchParamsMax = {
    2222        def max = 1000
    23         if(params.newMax.isInteger()) {
     23        if(params.newMax?.isInteger()) {
    2424            def i = params.newMax.toInteger()
    2525            if(i > 0 && i <= max)
  • TabularUnified trunk/grails-app/controllers/TaskDetailedController.groovy

    r589 r615  
    2626    def setSearchParamsMax = {
    2727        def max = 1000
    28         if(params.newMax.isInteger()) {
     28        if(params.newMax?.isInteger()) {
    2929            def i = params.newMax.toInteger()
    3030            if(i > 0 && i <= max)
     
    3939    def setSearchCalendarParamsMax = {
    4040        def max = 1000
    41         if(params.newMax.isInteger()) {
     41        if(params.newMax?.isInteger()) {
    4242            def i = params.newMax.toInteger()
    4343            if(i > 0 && i <= max)
  • TabularUnified trunk/grails-app/views/assetDetailed/search.gsp

    r570 r615  
    8989                <g:if test="${assetInstanceTotal > assetInstanceList.size()}">
    9090                    <div class="paginateButtons">
    91                         <g:paginate total="${assetInstanceTotal}" params="${filterParams}" />
     91                        <g:paginate action="search" total="${assetInstanceTotal}" params="${filterParams}" />
    9292                    </div>
    9393                </g:if>
     
    151151            </g:if>
    152152            <div class="paginateButtons">
    153                 <g:paginate total="${assetInstanceTotal}" params="${filterParams}" />
     153                <g:paginate action="search" total="${assetInstanceTotal}" params="${filterParams}" />
    154154            </div>
    155155
  • TabularUnified trunk/grails-app/views/assetSubItemDetailed/search.gsp

    r570 r615  
    7070                <g:if test="${assetSubItemInstanceTotal > assetSubItemInstanceList.size()}">
    7171                    <div class="paginateButtons">
    72                         <g:paginate total="${assetSubItemInstanceTotal}" params="${filterParams}" />
     72                        <g:paginate action="search" total="${assetSubItemInstanceTotal}" params="${filterParams}" />
    7373                    </div>
    7474                </g:if>
     
    126126            </g:if>
    127127            <div class="paginateButtons">
    128                 <g:paginate total="${assetSubItemInstanceTotal}" params="${filterParams}" />
     128                <g:paginate action="search" total="${assetSubItemInstanceTotal}" params="${filterParams}" />
    129129            </div>
    130130
  • TabularUnified trunk/grails-app/views/inventoryItemDetailed/search.gsp

    r578 r615  
    162162                <g:if test="${inventoryItemInstanceTotal > inventoryItemInstanceList.size()}">
    163163                    <div class="paginateButtons">
    164                         <g:paginate total="${inventoryItemInstanceTotal}" params="${filterParams}" />
     164                        <g:paginate action="search" total="${inventoryItemInstanceTotal}" params="${filterParams}" />
    165165                    </div>
    166166                </g:if>
     
    236236            </g:if>
    237237            <div class="paginateButtons">
    238                 <g:paginate total="${inventoryItemInstanceTotal}" params="${filterParams}" />
     238                <g:paginate action="search" total="${inventoryItemInstanceTotal}" params="${filterParams}" />
    239239            </div>
    240240
  • TabularUnified trunk/grails-app/views/inventoryItemPurchaseDetailed/search.gsp

    r605 r615  
    7171                <g:if test="${inventoryItemPurchaseTotal > inventoryItemPurchaseList.size()}">
    7272                    <div class="paginateButtons">
    73                         <g:paginate total="${inventoryItemPurchaseTotal}" params="${filterParams}" />
     73                        <g:paginate action="search" total="${inventoryItemPurchaseTotal}" params="${filterParams}" />
    7474                    </div>
    7575                </g:if>
     
    186186            </g:if>
    187187            <div class="paginateButtons">
    188                 <g:paginate total="${inventoryItemPurchaseTotal}" params="${filterParams}" />
     188                <g:paginate action="search" total="${inventoryItemPurchaseTotal}" params="${filterParams}" />
    189189            </div>
    190190
  • TabularUnified trunk/grails-app/views/taskDetailed/search.gsp

    r613 r615  
    7575            <g:if test="${taskInstanceTotal > taskInstanceList.size()}">
    7676                <div class="paginateButtons">
    77                     <g:paginate total="${taskInstanceTotal}" params="${filterParams}" />
     77                    <g:paginate action="search" total="${taskInstanceTotal}" params="${filterParams}" />
    7878                </div>
    7979            </g:if>
Note: See TracChangeset for help on using the changeset viewer.