Ignore:
Timestamp:
May 22, 2011, 12:29:29 AM (13 years ago)
Author:
gav
Message:

Svn merge -r920:r941 trunk/ into branches/features/purchaseOrders.
This brings the purchaseOrder branch fully up to date.

Location:
branches/features/purchaseOrders
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/features/purchaseOrders

    • Property svn:ignore

      •  

        old new  
        11*.log*
        22*.war
         3*.iml
         4*.ipr
         5*.iws
        36target
         7out
        48.directory
        5 
        6 *.iml
    • Property svn:mergeinfo changed
      /trunkmerged: 921-923,​932-936,​939-941

  • branches/features/purchaseOrders/grails-app/conf/BootStrap.groovy

    r876 r942  
     1import org.codehaus.groovy.grails.commons.ConfigurationHolder as CH
     2
    13class BootStrap
    24{
    … …  
    1517                createDataService.ensureSystemAndAdminAccess()
    1618                createDataService.createBaseData()
     19                CH.config.demoMode.enabled = true
    1720                createDataService.createDemoData()
    1821                createDataService.startSearchableIndex()
    … …  
    2831                createDataService.ensureSystemAndAdminAccess()
    2932                createDataService.createBaseData()
     33                if(CH.config.demoMode.enabled) createDataService.createDemoData()
    3034                createDataService.startSearchableIndex()
    3135            }
Note: See TracChangeset for help on using the changeset viewer.