Changeset 942


Ignore:
Timestamp:
May 22, 2011, 12:29:29 AM (8 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:
5 deleted
11 edited
4 copied

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            }
  • branches/features/purchaseOrders/grails-app/conf/BuildConfig.groovy

    r920 r942  
    22grails.project.test.class.dir = "target/test-classes"
    33grails.project.test.reports.dir = "target/test-reports"
    4 
    5 def env = System.getProperty('grails.env')
    6 
    7 switch (env) {
    8     case "production":
    9         //grails.project.war.file = "target/${appName}-${appVersion}.war"
    10         grails.project.war.file = "target/${appName}Live.war"
    11         break
    12     case "development":
    13         grails.project.war.file = "target/${appName}Dev.war"
    14         break
    15     default:
    16         grails.project.war.file = "target/${appName}.war"
    17         break
    18 }
     4//grails.project.war.file = "target/${appName}-${appVersion}.war"
     5grails.project.war.file = "target/${appName}.war"
    196
    207grails.war.resources = { stagingDir, args ->
  • branches/features/purchaseOrders/grails-app/conf/Config.groovy

    r924 r942  
    1010//    grails.config.locations << "file:" + System.properties["${appName}.config.location"]
    1111// }
     12
     13// Local config file (development) otherwise try the classpath (production).
     14if(new File("${appName}-config.groovy").exists())
     15    grails.config.locations = [ "file:${appName}-config.groovy" ]
     16else
     17    grails.config.locations = [ "classpath:${appName}-config.groovy" ]
    1218
    1319// Set false due to acegi security issue.
     
    8187 * Basic log levels are ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < OFF
    8288 */
    83 
    8489log4j = {
    8590    appenders {
     
    404409    ]
    405410]
    406 
    407 /**
    408  * Custom application global settings.
    409  * @todo: externalise these settings to a config file (along with the database settings) or have them configurable via the web interface+database.
    410  */
    411 taskRecurringScheduleJob.repeatInterval=10
    412 // It is recommended to limit the currencyList to the one that the site uses e.g: currencyList = ['AUD']
    413 currencyList = ['EUR', 'XCD', 'USD', 'XOF', 'NOK', 'AUD', 'XAF', 'NZD', 'MAD', 'DKK', 'GBP', 'CHF', 'XPF', 'ILS', 'ROL', 'TRL']
    414 
  • branches/features/purchaseOrders/grails-app/conf/DataSource.groovy

    r881 r942  
    1616
    1717// Environment specific settings.
     18// All production config is in external config.
    1819environments {
    1920    development {
     
    5152        }
    5253    }
    53     production {
    54         dataSource {
    55             /* Delete dbCreate line after setup! */
    56             /** HSQLDB - In memory */
    57 //             driverClassName = "org.hsqldb.jdbcDriver"
    58 //             username = "sa"
    59 //             password = ""
    60 //             dbCreate = "create-drop"
    61 //             url = "jdbc:hsqldb:mem:devDb"
    62             /** HSQLDB - In file */
    63 //             driverClassName = "org.hsqldb.jdbcDriver"
    64 //             username = "sa"
    65 //             password = ""
    66 //             dbCreate = "update"
    67 //             url = "jdbc:hsqldb:file:prodDb;shutdown=true"
    68             /** MSSQL */
    69             //For more info see the docs that you downloaded with the driver.
    70 //             dialect = org.hibernate.dialect.SQLServerDialect // MSSQL 2000+2005 Useful with `grails schema-export`
    71 //             driverClassName = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
    72 //             username = "gnumimsadmin"
    73 //             password = "gnumimsadmin"
    74 //             dbCreate = "update"
    75 //             url = "jdbc:sqlserver://gnumimssql01:1433;databaseName=gnumims_prod"
    76             /** MySQL */
    77             dialect = org.hibernate.dialect.MySQL5InnoDBDialect
    78             driverClassName = "com.mysql.jdbc.Driver"
    79             username = "gnumimsadmin"
    80             password = "gnumimsadmin"
    81             dbCreate = "update"
    82             url = "jdbc:mysql://gnumimssql01:3306/gnumims_prod?autoReconnect=true&sessionVariables=storage_engine=InnoDB"
    83         }
    84 
    85     }
    8654}
  • branches/features/purchaseOrders/grails-app/controllers/TaskDetailedController.groovy

    r920 r942  
    888888    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_TaskManager', 'ROLE_TaskUser'])
    889889    def workLoad= {
     890        def filterParams = [:]
    890891        def result = taskSearchService.getWorkLoad(params, RCU.getLocale(request))
    891892
     
    900901                    workLoadGroups: result.workLoadGroups,
    901902                    totalHours: result.totalHours,
    902                     totalMinutes: result.totalMinutes]
     903                    totalMinutes: result.totalMinutes,
     904                    filterParams: filterParams]
    903905    } // workLoad
    904906
  • branches/features/purchaseOrders/grails-app/taglib/CustomTagLib.groovy

    r920 r942  
    174174//             def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource")
    175175//             def locale = RCU.getLocale(request)
    176 // 
     176//
    177177//             title = messageSource.getMessage(titleKey, null, title, locale)
    178178//         }
     
    374374
    375375    /**
     376     * Returns the correct headerId for the main header div.
     377     */
     378    def headerId = { attrs, body ->
     379        def headerId = ''
     380        if(grails.util.Environment.isDevelopmentMode()) headerId = 'HeaderDev'
     381        else if(grailsApplication.config.demoMode.enabled) headerId = 'HeaderDemo'
     382        else headerId = 'Header'
     383        out << headerId
     384    }
     385
     386    /**
    376387    * Determine if a supplied string is considered a url or not.
    377388    * The scheme/protocol can be adjusted, file:// has been excluded here.
  • branches/features/purchaseOrders/grails-app/views/_about.gsp

    r521 r942  
    191191                </td>
    192192            </tr>
    193                 <tr>
    194                     <td>
    195                         Plugins: ${plugins}
    196                     </td>
    197                 </tr>
    198         </tbody>
    199     </table>
    200 </div>
     193            <tr>
     194                <td>
     195                    Plugins: ${plugins}
     196                </td>
     197            </tr>
     198            <tr>
     199                <td>
     200                    Java version: ${System.getProperty('java.version').encodeAsHTML()} (As supplied by host JVM) <br />
     201                    Groovy version: ${org.codehaus.groovy.runtime.InvokerHelper.getVersion()} (As supplied with Grails)
     202                </td>
     203            </tr>
     204        </tbody>
     205    </table>
     206</div>
  • branches/features/purchaseOrders/grails-app/views/layouts/main.gsp

    r850 r942  
    3434                    <g:message code="ajax.default.could.not.perform.operation" />
    3535                </div>
    36                 <g:if env="production">
    37                     <div id="Header">
    38                         <a href="javascript: openWindow('http://www.gnumims.org')" id=HeaderLink></a>
    39                     </div>
    40                 </g:if>
    41                 <g:else>
    42                     <div id="HeaderDev">
    43                         <a href="javascript: openWindow('http://www.gnumims.org')" id=HeaderLink></a>
    44                     </div>
    45                 </g:else>
     36                <div id="${custom.headerId()}">
     37                    <a href="javascript: openWindow('http://www.gnumims.org')" id=HeaderLink></a>
     38                </div>
    4639
    4740                <g:isLoggedIn>
  • branches/features/purchaseOrders/grails-app/views/login/auth.gsp

    r221 r942  
    7272        <h1>Welcome to gnuMims please log in</h1>
    7373
    74         <g:if env="development">
     74        <g:if test="${grailsApplication.config.demoMode.enabled}">
    7575        The demo users are <b>user</b>, <b>manager</b> and  <b>admin</b> all having the password: <b>pass</b>
    7676        </g:if>
     
    8585                    <label for='j_username'>Login ID</label>
    8686
    87                     <g:if env="production">
    88                         <input type='text' class='text_' name='j_username' id='j_username'/>
     87                    <g:if test="${grailsApplication.config.demoMode.enabled}">
     88                        <input type='text' class='text_' name='j_username' id='j_username' value='manager'  />
    8989                    </g:if>
    9090                    <g:else >
    91                         <input type='text' class='text_' name='j_username' id='j_username' value='manager'  />
     91                        <input type='text' class='text_' name='j_username' id='j_username'/>
    9292                    </g:else >
    9393
     
    9696                    <label for='j_password'>Password</label>
    9797
    98                     <g:if env="production">
    99                         <input type='password' class='text_' name='j_password' id='j_password' />
     98                    <g:if test="${grailsApplication.config.demoMode.enabled}">
     99                        <input type='password' class='text_' name='j_password' id='j_password' value="pass" />
    100100                    </g:if>
    101101                    <g:else >
    102                         <input type='password' class='text_' name='j_password' id='j_password' value="pass" />
     102                        <input type='password' class='text_' name='j_password' id='j_password' />
    103103                    </g:else >
    104104                </p>
  • branches/features/purchaseOrders/web-app/css/main.css

    r883 r942  
    7676  height: 136px;
    7777}
     78#HeaderDemo {
     79  background: transparent url("../images/logoOnlineDemo.png") no-repeat scroll center;
     80  width: 980px;
     81  height: 136px;
     82}
    7883#HeaderLink{
    7984  display: block;
     
    693698.subnavigation li a:hover {
    694699    /*color: red;*/
    695     /*border-color: black;*/ 
     700    /*border-color: black;*/
    696701    border-width: 1px 0;
    697702}
Note: See TracChangeset for help on using the changeset viewer.