Changeset 881 for branches/features

Timestamp:

Apr 11, 2011, 4:11:58 PM (14 years ago)

Author:

gav

Message:

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

Location:

branches/features/grailsUpgrade/grails-app

Files:

• conf/DataSource.groovy (modified) (4 diffs)
• views/assetSubItemDetailed/show.gsp (modified) (1 diff)

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

@@ -26 +26 @@
             url = "jdbc:hsqldb:mem:devDb"
             /** MySQL */
+//             dialect = org.hibernate.dialect.MySQL5InnoDBDialect
 //             driverClassName = "com.mysql.jdbc.Driver"
 //             username = "gnumimsadmin"
@@ -42 +43 @@
             url = "jdbc:hsqldb:mem:devDb"
             /** MySQL */
+//             dialect = org.hibernate.dialect.MySQL5InnoDBDialect
 //             driverClassName = "com.mysql.jdbc.Driver"
 //             username = "gnumimsadmin"
@@ -66 +68 @@
             /** MSSQL */
             //For more info see the docs that you downloaded with the driver.
-//             dialect = org.hibernate.dialect.SQLServerDialect // Useful with `grails schema-export`
+//             dialect = org.hibernate.dialect.SQLServerDialect // MSSQL 2000+2005 Useful with `grails schema-export`
 //             driverClassName = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
 //             username = "gnumimsadmin"
@@ -73 +75 @@
 //             url = "jdbc:sqlserver://gnumimssql01:1433;databaseName=gnumims_prod"
             /** MySQL */
+            dialect = org.hibernate.dialect.MySQL5InnoDBDialect
             driverClassName = "com.mysql.jdbc.Driver"
             username = "gnumimsadmin"

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

@@ -135 +135 @@
                             <td  valign="top" style="text-align:left;" class="value">
                                 <ul>
-                                <g:each var="s" in="${assetSubItemInstance.subItems}">
+                                <g:each var="s" in="${assetSubItemInstance.subItems.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }">
                                     <li><g:link controller="assetSubItemDetailed" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>
                                 </g:each>