Ignore:
Timestamp:
Apr 11, 2011, 4:11:58 PM (15 years ago)
Author:
gav
Message:

Svn merge -r874:r878 trunk/ into branches/features/grailsUpgrade/.

Location:
branches/features/grailsUpgrade/grails-app
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/features/grailsUpgrade/grails-app/conf/DataSource.groovy

    r606 r881  
    2626            url = "jdbc:hsqldb:mem:devDb"
    2727            /** MySQL */
     28//             dialect = org.hibernate.dialect.MySQL5InnoDBDialect
    2829//             driverClassName = "com.mysql.jdbc.Driver"
    2930//             username = "gnumimsadmin"
    … …  
    4243            url = "jdbc:hsqldb:mem:devDb"
    4344            /** MySQL */
     45//             dialect = org.hibernate.dialect.MySQL5InnoDBDialect
    4446//             driverClassName = "com.mysql.jdbc.Driver"
    4547//             username = "gnumimsadmin"
    … …  
    6668            /** MSSQL */
    6769            //For more info see the docs that you downloaded with the driver.
    68 //             dialect = org.hibernate.dialect.SQLServerDialect // Useful with `grails schema-export`
     70//             dialect = org.hibernate.dialect.SQLServerDialect // MSSQL 2000+2005 Useful with `grails schema-export`
    6971//             driverClassName = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
    7072//             username = "gnumimsadmin"
    … …  
    7375//             url = "jdbc:sqlserver://gnumimssql01:1433;databaseName=gnumims_prod"
    7476            /** MySQL */
     77            dialect = org.hibernate.dialect.MySQL5InnoDBDialect
    7578            driverClassName = "com.mysql.jdbc.Driver"
    7679            username = "gnumimsadmin"

  • branches/features/grailsUpgrade/grails-app/views/assetSubItemDetailed/show.gsp

    r683 r881  
    135135                            <td  valign="top" style="text-align:left;" class="value">
    136136                                <ul>
    137                                 <g:each var="s" in="${assetSubItemInstance.subItems}">
     137                                <g:each var="s" in="${assetSubItemInstance.subItems.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }">
    138138                                    <li><g:link controller="assetSubItemDetailed" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>
    139139                                </g:each>
Note: See TracChangeset for help on using the changeset viewer.