racetrack_ch3/grails-app/conf/RacetrackUrlMappings.groovy racetrack_ch3/grails-app/i18n/messages_de.properties racetrack_ch3/grails-app/i18n/messages_fr.properties racetrack_ch3/grails-app/i18n/messages_ja.properties racetrack_ch3/grails-app/i18n/messages_nl.properties racetrack_ch3/grails-app/i18n/messages_ru.properties racetrack_ch3/grails-app/i18n/messages_zh_CN.properties racetrack_ch3/plugins/core/grails-app/utils/Base64Codec.groovy racetrack_ch3/web-app/WEB-INF/templates/scaffolding/Controller.groovy racetrack_ch3/web-app/WEB-INF/templates/scaffolding/create.gsp racetrack_ch3/web-app/WEB-INF/templates/scaffolding/edit.gsp racetrack_ch3/web-app/WEB-INF/templates/scaffolding/list.gsp racetrack_ch3/web-app/WEB-INF/templates/scaffolding/show.gsp racetrack_ch3/web-app/index.gsp racetrack_ch4/grails-app/conf/RacetrackUrlMappings.groovy racetrack_ch4/grails-app/i18n/messages_de.properties racetrack_ch4/grails-app/i18n/messages_fr.properties racetrack_ch4/grails-app/i18n/messages_ja.properties racetrack_ch4/grails-app/i18n/messages_nl.properties racetrack_ch4/grails-app/i18n/messages_ru.properties racetrack_ch4/grails-app/i18n/messages_zh_CN.properties racetrack_ch4/plugins/core/grails-app/utils/Base64Codec.groovy racetrack_ch4/web-app/WEB-INF/templates/scaffolding/Controller.groovy racetrack_ch4/web-app/WEB-INF/templates/scaffolding/create.gsp racetrack_ch4/web-app/WEB-INF/templates/scaffolding/edit.gsp racetrack_ch4/web-app/WEB-INF/templates/scaffolding/list.gsp racetrack_ch4/web-app/WEB-INF/templates/scaffolding/show.gsp racetrack_ch4/web-app/index.gsp racetrack_ch5/grails-app/conf/RacetrackUrlMappings.groovy racetrack_ch5/grails-app/i18n/messages_de.properties racetrack_ch5/grails-app/i18n/messages_fr.properties racetrack_ch5/grails-app/i18n/messages_ja.properties racetrack_ch5/grails-app/i18n/messages_nl.properties racetrack_ch5/grails-app/i18n/messages_ru.properties racetrack_ch5/grails-app/i18n/messages_zh_CN.properties racetrack_ch5/plugins/core/grails-app/utils/Base64Codec.groovy racetrack_ch5/web-app/WEB-INF/templates/scaffolding/Controller.groovy racetrack_ch5/web-app/WEB-INF/templates/scaffolding/create.gsp racetrack_ch5/web-app/WEB-INF/templates/scaffolding/edit.gsp racetrack_ch5/web-app/WEB-INF/templates/scaffolding/list.gsp racetrack_ch5/web-app/WEB-INF/templates/scaffolding/show.gsp racetrack_ch5/web-app/index.gsp racetrack_ch6/grails-app/conf/RacetrackUrlMappings.groovy racetrack_ch6/grails-app/i18n/messages_de.properties racetrack_ch6/grails-app/i18n/messages_fr.properties racetrack_ch6/grails-app/i18n/messages_ja.properties racetrack_ch6/grails-app/i18n/messages_nl.properties racetrack_ch6/grails-app/i18n/messages_ru.properties racetrack_ch6/grails-app/i18n/messages_zh_CN.properties racetrack_ch6/plugins/core/grails-app/utils/Base64Codec.groovy racetrack_ch6/web-app/WEB-INF/templates/scaffolding/Controller.groovy racetrack_ch6/web-app/WEB-INF/templates/scaffolding/create.gsp racetrack_ch6/web-app/WEB-INF/templates/scaffolding/edit.gsp racetrack_ch6/web-app/WEB-INF/templates/scaffolding/list.gsp racetrack_ch6/web-app/WEB-INF/templates/scaffolding/show.gsp racetrack_ch6/web-app/index.gsp racetrack_ch7/grails-app/conf/RacetrackUrlMappings.groovy racetrack_ch7/grails-app/i18n/messages_de.properties racetrack_ch7/grails-app/i18n/messages_fr.properties racetrack_ch7/grails-app/i18n/messages_ja.properties racetrack_ch7/grails-app/i18n/messages_nl.properties racetrack_ch7/grails-app/i18n/messages_ru.properties racetrack_ch7/grails-app/i18n/messages_zh_CN.properties racetrack_ch7/plugins/core/grails-app/utils/Base64Codec.groovy racetrack_ch7/target/test-reports/TEST-RaceControllerTests.xml racetrack_ch7/target/test-reports/TEST-RaceTests.xml racetrack_ch7/target/test-reports/TEST-RegistrationControllerTests.xml racetrack_ch7/target/test-reports/TEST-RegistrationTests.xml racetrack_ch7/target/test-reports/TEST-UserTests.xml racetrack_ch7/target/test-reports/plain/TEST-RaceControllerTests.txt racetrack_ch7/target/test-reports/plain/TEST-RaceTests.txt racetrack_ch7/target/test-reports/plain/TEST-RegistrationControllerTests.txt racetrack_ch7/target/test-reports/plain/TEST-RegistrationTests.txt racetrack_ch7/target/test-reports/plain/TEST-UserTests.txt racetrack_ch7/web-app/WEB-INF/templates/scaffolding/Controller.groovy racetrack_ch7/web-app/WEB-INF/templates/scaffolding/create.gsp racetrack_ch7/web-app/WEB-INF/templates/scaffolding/edit.gsp racetrack_ch7/web-app/WEB-INF/templates/scaffolding/list.gsp racetrack_ch7/web-app/WEB-INF/templates/scaffolding/show.gsp racetrack_ch7/web-app/index.gsp racetrack_ch8/grails-app/conf/RacetrackUrlMappings.groovy racetrack_ch8/grails-app/i18n/messages_de.properties racetrack_ch8/grails-app/i18n/messages_fr.properties racetrack_ch8/grails-app/i18n/messages_ja.properties racetrack_ch8/grails-app/i18n/messages_nl.properties racetrack_ch8/grails-app/i18n/messages_ru.properties racetrack_ch8/grails-app/i18n/messages_zh_CN.properties racetrack_ch8/plugins/core/grails-app/utils/Base64Codec.groovy racetrack_ch8/prodDb.script racetrack_ch8/racetrack-0.1.war racetrack_ch8/target/test-reports/TEST-RaceControllerTests.xml racetrack_ch8/target/test-reports/TEST-RaceTests.xml racetrack_ch8/target/test-reports/TEST-RegistrationControllerTests.xml racetrack_ch8/target/test-reports/TEST-RegistrationTests.xml racetrack_ch8/target/test-reports/TEST-UserTests.xml racetrack_ch8/target/test-reports/plain/TEST-RaceControllerTests.txt racetrack_ch8/target/test-reports/plain/TEST-RaceTests.txt racetrack_ch8/target/test-reports/plain/TEST-RegistrationControllerTests.txt racetrack_ch8/target/test-reports/plain/TEST-RegistrationTests.txt racetrack_ch8/target/test-reports/plain/TEST-UserTests.txt racetrack_ch8/web-app/WEB-INF/templates/scaffolding/Controller.groovy racetrack_ch8/web-app/WEB-INF/templates/scaffolding/create.gsp racetrack_ch8/web-app/WEB-INF/templates/scaffolding/edit.gsp racetrack_ch8/web-app/WEB-INF/templates/scaffolding/list.gsp racetrack_ch8/web-app/WEB-INF/templates/scaffolding/show.gsp racetrack_ch8/web-app/index.gsp @@ -10,7 +10,9 @@ <classpathentry kind="src" path="grails-tests"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="var" path="GRAILS_HOME/ant/lib/ant.jar"/> - <classpathentry kind="var" path="GRAILS_HOME/lib/ant-nodeps.jar" /> + <classpathentry kind="var" path="GRAILS_HOME/lib/ant-junit.jar" /> + +<classpathentry kind="var" path="GRAILS_HOME/lib/ant-nodeps.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/ant.jar" /> @@ -48,9 +50,9 @@ <classpathentry kind="var" path="GRAILS_HOME/lib/ejb3-persistence.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/gant-0.2.2-SNAPSHOT.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/gant-0.2.5-SNAPSHOT.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/groovy-all-1.0.1-SNAPSHOT.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/groovy-all-1.1-BETA-1.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/groovy-starter.jar" /> @@ -80,13 +82,13 @@ <classpathentry kind="var" path="GRAILS_HOME/lib/log4j-1.2.8.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/ognl-2.7.jar" /> - <classpathentry kind="var" path="GRAILS_HOME/lib/org.mortbay.jetty.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/oro-2.0.8.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/quartz-1.5.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/quartz-1.6.0.jar" /> + +<classpathentry kind="var" path="GRAILS_HOME/lib/serializer.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/servletapi-2.4.jar" /> @@ -106,18 +108,20 @@ <classpathentry kind="var" path="GRAILS_HOME/lib/standard-2.4.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/xalan.jar" /> + <classpathentry kind="var" path="GRAILS_HOME/lib/xerces-2.6.2.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/xml-apis.jar" /> - <classpathentry kind="var" path="GRAILS_HOME/dist/grails-core-0.4.2.jar" /> + <classpathentry kind="var" path="GRAILS_HOME/dist/grails-core-0.5.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/dist/grails-crud-0.4.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/dist/grails-crud-0.5.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/dist/grails-gorm-0.4.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/dist/grails-gorm-0.5.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/dist/grails-web-0.4.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/dist/grails-web-0.5.jar" /> <classpathentry kind="output" path="web-app/WEB-INF/classes"/> racetrack_ch3/.classpath @@ -1,4 +1,4 @@ -#Do not edit app.grails.* properties, they may change automatically. DO NOT put application configuration in here, it is not the right place! -#Sun Mar 11 15:49:46 EDT 2007 -app.grails.version=0.4.2 +#Wed May 02 20:22:50 EDT 2007 +app.version=0.1 +app.grails.version=0.5 app.name=racetrack racetrack_ch3/application.properties @@ -1,8 +1,8 @@ -class DevelopmentDataSource { +class DevelopmentDataSource { boolean pooling = true String dbCreate = "update" String url = "jdbc:mysql://localhost/racetrack_dev" String driverClassName = "com.mysql.jdbc.Driver" String username = "jason" String password = "" -} +} racetrack_ch3/grails-app/conf/DevelopmentDataSource.groovy @@ -4,7 +4,28 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.rootLogger=error, stdout -# Enable this logger to log Hibernate output +# This logger is for your own application artefact logs +# Artefacts are logged by their type and optionally class name i.e: +# +# log4j.logger.grails.app.controller.HelloController=debug, stdout +# ...will control the logs from just that controller +# +# log4j.logger.grails.app.domain=trace, stdout +# ...will control the logs for all domain classes +# +# At the time of writing, supported artefact type ids include: +# domain (aka Domain Class), task (aka Job), service, dataSource, +# controller, tagLib, urlMappings, codec, bootstrap +# +# The default "info" level for all artefacts is set here +log4j.logger.grails.app=info,stdout +log4j.additivity.grails.app=false + +## This logger is for Grails' public APIs within the grails. package +log4j.logger.grails=info,stdout +log4j.additivity.grails=false + +## Enable this logger to log Hibernate output # handy to see its database interaction activity #log4j.logger.org.hibernate=debug,stdout #log4j.additivity.org.hibernate=false @@ -37,7 +58,3 @@ log4j.logger.org.codehaus.groovy.grails.plugins=info,stdout log4j.additivity.org.codehaus.groovy.grails.plugins=false log4j.logger.grails.spring=info,stdout log4j.additivity.grails.spring=false - -# This logger is for Grails' public APIs within the grails. package -log4j.logger.grails=info,stdout -log4j.additivity.grails=false racetrack_ch3/grails-app/conf/log4j.development.properties @@ -4,7 +4,28 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.rootLogger=error, stdout -# Enable this logger to log Hibernate output +# This logger is for your own application artefact logs +# Artefacts are logged by their type and optionally class name i.e: +# +# log4j.logger.grails.app.controller.HelloController=debug, stdout +# ...will control the logs from just that controller +# +# log4j.logger.grails.app.domain=trace, stdout +# ...will control the logs for all domain classes +# +# At the time of writing, supported artefact type ids include: +# domain (aka Domain Class), task (aka Job), service, dataSource, +# controller, tagLib, urlMappings, codec, bootstrap +# +# The default "info" level for all artefacts is set here +log4j.logger.grails.app=info,stdout +log4j.additivity.grails.app=false + +## This logger is for Grails' public APIs within the grails. package +log4j.logger.grails=info,stdout +log4j.additivity.grails=false + +## Enable this logger to log Hibernate output # handy to see its database interaction activity #log4j.logger.org.hibernate=debug,stdout #log4j.additivity.org.hibernate=false @@ -37,7 +58,3 @@ log4j.logger.org.codehaus.groovy.grails.plugins=info,stdout log4j.additivity.org.codehaus.groovy.grails.plugins=false log4j.logger.grails.spring=info,stdout log4j.additivity.grails.spring=false - -# This logger is for Grails' public APIs within the grails. package -log4j.logger.grails=info,stdout -log4j.additivity.grails=false racetrack_ch3/grails-app/conf/log4j.production.properties @@ -4,7 +4,28 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.rootLogger=error, stdout -# Enable this logger to log Hibernate output +# This logger is for your own application artefact logs +# Artefacts are logged by their type and optionally class name i.e: +# +# log4j.logger.grails.app.controller.HelloController=debug, stdout +# ...will control the logs from just that controller +# +# log4j.logger.grails.app.domain=trace, stdout +# ...will control the logs for all domain classes +# +# At the time of writing, supported artefact type ids include: +# domain (aka Domain Class), task (aka Job), service, dataSource, +# controller, tagLib, urlMappings, codec, bootstrap +# +# The default "info" level for all artefacts is set here +log4j.logger.grails.app=info,stdout +log4j.additivity.grails.app=false + +## This logger is for Grails' public APIs within the grails. package +log4j.logger.grails=info,stdout +log4j.additivity.grails=false + +## Enable this logger to log Hibernate output # handy to see its database interaction activity #log4j.logger.org.hibernate=debug,stdout #log4j.additivity.org.hibernate=false @@ -37,7 +58,3 @@ log4j.logger.org.codehaus.groovy.grails.plugins=info,stdout log4j.additivity.org.codehaus.groovy.grails.plugins=false log4j.logger.grails.spring=info,stdout log4j.additivity.grails.spring=false - -# This logger is for Grails' public APIs within the grails. package -log4j.logger.grails=info,stdout -log4j.additivity.grails=false racetrack_ch3/grails-app/conf/log4j.test.properties @@ -1,4 +1,4 @@ -class Race { +class Race { String name Date startDateTime String city @@ -7,16 +7,16 @@ class Race { Float cost Integer maxRunners = 100000 - static hasMany = [registrations:Registration] + static hasMany = [registrations:Registration] static constraints = { - name(maxLength:50,blank:false) - startDateTime(validator: {return (it > new Date())}) - city(maxLength:30,blank:false) + name(maxSize:50,blank:false) + startDateTime(validator: {return (it > new Date())}) + city(maxSize:30,blank:false) state(inList:['GA', 'NC', 'SC', 'VA'],blank:false) distance(min:3.1f,max:100f) cost(min:0f,max:999.99f) - } + } - String toString() {"${this.name} : ${this.city}, ${this.state}"} -} \ No newline at end of file + String toString() {"${this.name} : ${this.city}, ${this.state}" } +} racetrack_ch3/grails-app/domain/Race.groovy @@ -1,4 +1,4 @@ -class Registration { +class Registration { Race race String name Date dateOfBirth @@ -6,19 +6,17 @@ class Registration { String postalAddress String emailAddress Date createdAt = new Date() - + static belongsTo = Race - - static optionals = ["postalAddress" ] - + static constraints = { - name(maxLength:50,blank:false) + name(maxSize:50,blank:false) dateOfBirth(nullable:false) gender(inList:["M", "F"]) - postalAddress(maxLength:255) - emailAddress(maxLength:50,email:true) + postalAddress(nullable:true,maxSize:255) + emailAddress(maxSize:50,email:true) race(nullable:false) } - - String toString() {"${this.name} : ${this.emailAddress}"} -} \ No newline at end of file + + String toString(){"${this.name}:${this.emailAddress}"} +} racetrack_ch3/grails-app/domain/Registration.groovy @@ -1,20 +1,19 @@ default.doesnt.match.message=Property [{0}] of class [{1}] with value [{2}] does not match the required pattern [{3}] default.invalid.url.message=Property [{0}] of class [{1}] with value [{2}] is not a valid URL default.invalid.creditCard.message=Property [{0}] of class [{1}] with value [{2}] is not a valid credit card number -default.invalid.email.message=Property [{0}] of class [{1}] with value [{2}] is not a valid e-mail address. -default.invalid.message=Property [{0}] of class [{1}] is not a valid [{2}]. +default.invalid.email.message=Property [{0}] of class [{1}] with value [{2}] is not a valid e-mail address default.invalid.range.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid range from [{3}] to [{4}] default.invalid.size.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid size range from [{3}] to [{4}] -default.invalid.length.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid size range from [{3}] to [{4}] -default.invalid.min.message=Property [{0}] of class [{1}] with value [{2}] is less than minimum value [{3}] default.invalid.max.message=Property [{0}] of class [{1}] with value [{2}] exceeds maximum value [{3}] -default.invalid.max.length.message=Property [{0}] of class [{1}] with value [{2}] exceeds the maximum size of [{3}] -default.invalid.min.length.message=Property [{0}] of class [{1}] with value [{2}] is less than the minimum size of [{3}] +default.invalid.min.message=Property [{0}] of class [{1}] with value [{2}] is less than minimum value [{3}] default.invalid.max.size.message=Property [{0}] of class [{1}] with value [{2}] exceeds the maximum size of [{3}] default.invalid.min.size.message=Property [{0}] of class [{1}] with value [{2}] is less than the minimum size of [{3}] +default.invalid.validator.message=Property [{0}] of class [{1}] with value [{2}] does not pass custom validation default.not.inlist.message=Property [{0}] of class [{1}] with value [{2}] is not contained within the list [{3}] default.blank.message=Property [{0}] of class [{1}] cannot be blank default.not.equal.message=Property [{0}] of class [{1}] with value [{2}] cannot equal [{3}] default.null.message=Property [{0}] of class [{1}] cannot be null default.not.unique.message=Property [{0}] of class [{1}] with value [{2}] must be unique -default.not.editable.message=Property [{0}] of class [{1}] with value [{2}] cannot be changed from [{3}] \ No newline at end of file + +default.paginate.prev=Previous +default.paginate.next=Next racetrack_ch3/grails-app/i18n/messages.properties @@ -27,19 +27,19 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='startDateTime'>Start Date Time:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'startDateTime','errors')}'><g:datePicker name='startDateTime' value="${race?.startDateTime}"></g:datePicker></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='state'>State:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'state','errors')}'><g:select name='state' from='${race.constraints.state.inList.collect{it.encodeAsHTML()}}' value="${race.state?.encodeAsHTML()}"></g:select></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}" /></td></tr> </tbody> </table> racetrack_ch3/grails-app/views/race/create.gsp @@ -33,19 +33,19 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='startDateTime'>Start Date Time:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'startDateTime','errors')}'><g:datePicker name='startDateTime' value="${race?.startDateTime}"></g:datePicker></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='state'>State:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'state','errors')}'><g:select name='state' from='${race.constraints.state.inList.collect{it.encodeAsHTML()}}' value="${race.state?.encodeAsHTML()}"></g:select></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}" /></td></tr> <tr class='prop'><td valign='top' class='name'><label for='registrations'>Registrations:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'registrations','errors')}'><ul> <g:each var='r' in='${race?.registrations?}'> racetrack_ch3/grails-app/views/race/edit.gsp @@ -20,21 +20,20 @@ <table> <thead> <tr> - - - <th>Id</th> - - <th>Name</th> - - <th>Start Date Time</th> - - <th>City</th> - - <th>State</th> - - <th>Distance</th> - - <th></th> + + <g:sortableColumn property="id" title="Id" /> + + <g:sortableColumn property="name" title="Name" /> + + <g:sortableColumn property="startDateTime" title="Start Date Time" /> + + <g:sortableColumn property="city" title="City" /> + + <g:sortableColumn property="state" title="State" /> + + <g:sortableColumn property="distance" title="Distance" /> + + <th></th> </tr> </thead> <tbody> racetrack_ch3/grails-app/views/race/list.gsp @@ -27,7 +27,7 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='dateOfBirth'>Date Of Birth:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'dateOfBirth','errors')}'><g:datePicker name='dateOfBirth' value="${registration?.dateOfBirth}"></g:datePicker></td></tr> @@ -35,7 +35,7 @@ <tr class='prop'><td valign='top' class='name'><label for='postalAddress'>Postal Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'postalAddress','errors')}'><textarea rows='5' cols='40' name='postalAddress'>${registration?.postalAddress?.encodeAsHTML()}</textarea></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='race'>Race:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'race','errors')}'><g:select optionKey="id" from="${Race.list()}" name='race.id' value="${registration?.race?.id}"></g:select></td></tr> racetrack_ch3/grails-app/views/registration/create.gsp @@ -33,7 +33,7 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='dateOfBirth'>Date Of Birth:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'dateOfBirth','errors')}'><g:datePicker name='dateOfBirth' value="${registration?.dateOfBirth}"></g:datePicker></td></tr> @@ -41,7 +41,7 @@ <tr class='prop'><td valign='top' class='name'><label for='postalAddress'>Postal Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'postalAddress','errors')}'><textarea rows='5' cols='40' name='postalAddress'>${registration?.postalAddress?.encodeAsHTML()}</textarea></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='race'>Race:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'race','errors')}'><g:select optionKey="id" from="${Race.list()}" name='race.id' value="${registration?.race?.id}"></g:select></td></tr> racetrack_ch3/grails-app/views/registration/edit.gsp @@ -20,21 +20,20 @@ <table> <thead> <tr> - - - <th>Id</th> - - <th>Name</th> - - <th>Date Of Birth</th> - - <th>Gender</th> - - <th>Postal Address</th> - - <th>Email Address</th> - - <th></th> + + <g:sortableColumn property="id" title="Id" /> + + <g:sortableColumn property="name" title="Name" /> + + <g:sortableColumn property="dateOfBirth" title="Date Of Birth" /> + + <g:sortableColumn property="gender" title="Gender" /> + + <g:sortableColumn property="postalAddress" title="Postal Address" /> + + <g:sortableColumn property="emailAddress" title="Email Address" /> + + <th></th> </tr> </thead> <tbody> racetrack_ch3/grails-app/views/registration/list.gsp @@ -25,7 +25,10 @@ import org.springframework.context.NoSuchMessageException; import org.springframework.web.servlet.support.RequestContextUtils as RCU; import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU; -class ApplicationTagLib { +class ApplicationTagLib { + + def grailsUrlMappingsHolder + /** * Creates a link to a resource, generally used as a method rather than a tag. * @@ -33,7 +36,7 @@ class ApplicationTagLib { */ def createLinkTo = { attrs -> out << grailsAttributes.getApplicationUri(request) - if(attrs['dir']) { + if(attrs['dir'] || attrs['dir'] == '') { out << "/${attrs['dir']}" } if(attrs['file']) { @@ -50,7 +53,7 @@ class ApplicationTagLib { def link = { attrs, body -> out << "<a href=\"" // create the link - createLink(attrs) + out << createLink(attrs) out << '\" ' // process remaining attributes @@ -59,7 +62,7 @@ class ApplicationTagLib { } out << ">" // output the body - body() + out << body() // close tag out << "</a>" @@ -79,29 +82,47 @@ class ApplicationTagLib { if(attrs['url']) { attrs = attrs.remove('url') } - // if the current attribute null set the controller uri to the current controller - if(attrs["controller"]) { - out << '/' << attrs.remove("controller") - } - else { - out << grailsAttributes.getControllerUri(request) - } - if(attrs["action"]) { - out << '/' << attrs.remove("action") - } - if(attrs["id"]) { - out << '/' << attrs.remove("id") - } - if(attrs['params']) { - def pms = attrs.remove('params') - out << '?' - def i = 0 - pms.each { k,v -> - out << "${k.encodeAsURL()}=${v?.encodeAsURL()}" - if(++i < pms.size()) - out << '&' - } - } + + def controller = attrs.containsKey("controller") ? attrs.remove("controller") : grailsAttributes.getController(request).controllerName + def action = attrs.remove("action") + def id = attrs.remove("id") + def params = attrs.params ? attrs.remove('params') : [:] + + def url + try { + if(id) params.id = id + def mapping = grailsUrlMappingsHolder?.getReverseMapping(controller,action,params) + params.controller = controller + if(action) params.action = action + url = mapping?.createURL(params) + } + finally { + params.remove('controller') + params.remove('action') + params.remove('id') + } + if(url) { + out << url + } + else { + out << '/' << controller + if(action) { + out << '/' << action + } + if(id) { + out << '/' << id + } + if(params) { + out << '?' + def i = 0 + params.each { k,v -> + out << "${k.encodeAsURL()}=${v?.encodeAsURL()}" + if(++i < params.size()) + out << '&' + } + } + } + } /** @@ -127,8 +148,8 @@ class ApplicationTagLib { } } } - out << '>' - body() + out << '>' + out << body() out << "</${attrs.name}>" } } racetrack_ch3/plugins/core/grails-app/taglib/ApplicationTagLib.groovy @@ -16,6 +16,7 @@ import org.springframework.validation.Errors; import org.springframework.context.NoSuchMessageException; import org.springframework.web.servlet.support.RequestContextUtils as RCU; import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU; +import org.codehaus.groovy.grails.commons.DomainClassArtefactHandler; /** * A tag lib that provides tags for working with form controls @@ -33,7 +34,10 @@ class FormTagLib { def textField = { attrs -> attrs.type = "text" attrs.tagName = "textField" - field(attrs) + def result = field(attrs) + if(result) { + out << result + } } /** * Creates a hidden field @@ -41,7 +45,7 @@ class FormTagLib { def hiddenField = { attrs -> attrs.type = "hidden" attrs.tagName = "hiddenField" - field(attrs) + out << field(attrs) } /** * Creates a submit button @@ -49,7 +53,7 @@ class FormTagLib { def submitButton = { attrs -> attrs.type = "submit" attrs.tagName = "submitButton" - field(attrs) + out << field(attrs) } /** * A general tag for creating fields @@ -84,7 +88,7 @@ class FormTagLib { void resolveAttributes(attrs) { if(!attrs.name && !attrs.field) { - throwTagError("Tag [$tagName] is missing required attribute [name] or [field]") + throwTagError("Tag [${attrs.tagName}] is missing required attribute [name] or [field]") } attrs.remove('tagName') @@ -121,7 +125,7 @@ class FormTagLib { def form = { attrs, body -> out << "<form action=\"" // create the link - createLink(attrs) + out << createLink(attrs) out << '\" ' // default to post @@ -133,26 +137,34 @@ class FormTagLib { out << ">" // output the body - body() + def bodyContent = body() + out << bodyContent // close tag out << "</form>" } /** * Creates a submit button that submits to an action in the controller specified by the form action - * The value of the action attribute is translated into the action name, for example "Edit" becomes - * "edit" or "List People" becomes "listPeople" + * The name of the action attribute is translated into the action name, for example "Edit" becomes + * "_action_edit" or "List People" becomes "_action_listPeople" + * If the action attribute is not specified, the value attribute will be used as part of the action name * * <g:actionSubmit value="Edit" /> + * <g:actionSubmit action="Edit" value="Some label for editing" /> * */ def actionSubmit = { attrs -> - out << '<input type="submit" name="_action" ' - def value = attrs.remove('value') - if(value) { - out << "value=\"${value}\" " + if(!attrs.value) { + throwTagError("Tag [$tagName] is missing required attribute [value]") } - // process remaining attributes + + // add action and value + def value = attrs.remove('value') + def action = attrs.action ? attrs.remove('action') : value + + out << "<input type=\"submit\" name=\"_action_${action}\" value=\"${value}\" " + + // process remaining attributes outputAttributes(attrs) // close tag @@ -161,22 +173,30 @@ class FormTagLib { } /** * Creates a an image submit button that submits to an action in the controller specified by the form action - * The value of the action attribute is translated into the action name, for example "Edit" becomes - * "edit" or "List People" becomes "listPeople" + * The name of the action attribute is translated into the action name, for example "Edit" becomes + * "_action_edit" or "List People" becomes "_action_listPeople" + * If the action attribute is not specified, the value attribute will be used as part of the action name * * <g:actionSubmitImage src="/images/submitButton.gif" action="Edit" /> * */ def actionSubmitImage = { attrs -> - out << '<input type="image" name="_action" ' - def value = attrs.remove('value') - if(value) { - out << "value=\"${value}\" " + if(!attrs.value) { + throwTagError("Tag [$tagName] is missing required attribute [value]") } + + // add action and value + def value = attrs.remove('value') + def action = attrs.action ? attrs.remove('action') : value + + out << "<input type=\"image\" name=\"_action_${action}\" value=\"${value}\" " + + // add image src def src = attrs.remove('src') if(src) { out << "src=\"${src}\" " } + // process remaining attributes outputAttributes(attrs) @@ -201,6 +221,8 @@ class FormTagLib { def value = (attrs['value'] ? attrs['value'] : xdefault) def name = attrs['name'] + def id = attrs['id'] ? attrs['id'] : name + def noSelection = attrs['noSelection'] if (noSelection != null) { @@ -253,7 +275,7 @@ class FormTagLib { // create day select if (precision >= PRECISION_RANKINGS["day"]) { - out.println "<select name=\"${name}_day\">" + out.println "<select name=\"${name}_day\" id=\"${id}_day\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -272,7 +294,7 @@ class FormTagLib { // create month select if (precision >= PRECISION_RANKINGS["month"]) { - out.println "<select name=\"${name}_month\">" + out.println "<select name=\"${name}_month\" id=\"${id}_month\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -294,7 +316,7 @@ class FormTagLib { // create year select if (precision >= PRECISION_RANKINGS["year"]) { - out.println "<select name=\"${name}_year\">" + out.println "<select name=\"${name}_year\" id=\"${id}_year\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -313,7 +335,7 @@ class FormTagLib { // do hour select if (precision >= PRECISION_RANKINGS["hour"]) { - out.println "<select name=\"${name}_hour\">" + out.println "<select name=\"${name}_hour\" id=\"${id}_hour\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -338,7 +360,7 @@ class FormTagLib { // do minute select if (precision >= PRECISION_RANKINGS["minute"]) { - out.println "<select name=\"${name}_minute\">" + out.println "<select name=\"${name}_minute\" id=\"${id}_minute\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -360,7 +382,7 @@ class FormTagLib { def renderNoSelectionOption = { noSelectionKey, noSelectionValue, value -> // If a label for the '--Please choose--' first item is supplied, write it out out << '<option value="' << (noSelectionKey == null ? "" : noSelectionKey) << '"' - if(noSelectionKey == value) { + if(noSelectionKey.equals(value)) { out << ' selected="selected" ' } out << '>' << noSelectionValue.encodeAsHTML() << '</option>' @@ -388,7 +410,7 @@ class FormTagLib { } // use generic select - select( attrs ) + out << select( attrs ) } /** @@ -405,7 +427,7 @@ class FormTagLib { attrs['optionValue'] = { "${it.language}, ${it.country}, ${it.displayName}" } // use generic select - select( attrs ) + out << select( attrs ) } /** @@ -425,7 +447,7 @@ class FormTagLib { attrs.value = null } // invoke generic select - select( attrs ) + out << select( attrs ) } /** @@ -436,11 +458,15 @@ class FormTagLib { * <g:select name="user.company.id" from="${Company.list()}" value="${user?.company.id}" optionKey="id" /> */ def select = { attrs -> + def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource") + def locale = RCU.getLocale(request) + def from = attrs.remove('from') def keys = attrs.remove('keys') def optionKey = attrs.remove('optionKey') def optionValue = attrs.remove('optionValue') def value = attrs.remove('value') + def valueMessagePrefix = attrs.remove('valueMessagePrefix') def noSelection = attrs.remove('noSelection') if (noSelection != null) { noSelection = noSelection.entrySet().iterator().next() @@ -461,20 +487,21 @@ class FormTagLib { // create options from list if(from) { from.eachWithIndex { el,i -> + def keyValue = null out << '<option ' if(keys) { - out << 'value="' << keys[i] << '" ' - if(keys[i] == value) { + keyValue = keys[i] + out << 'value="' << keyValue << '" ' + if(keyValue == value) { out << 'selected="selected" ' } } - else if(optionKey) { - def keyValue = null + else if(optionKey) { if(optionKey instanceof Closure) { keyValue = optionKey(el) - out << 'value="' << keyValue << '" ' + out << 'value="' << keyValue << '" ' } - else if(el !=null && optionKey == 'id' && grailsApplication.getGrailsDomainClass(el.getClass().name)) { + else if(el !=null && optionKey == 'id' && grailsApplication.getArtefact(DomainClassArtefactHandler.TYPE, el.getClass().name)) { keyValue = el.ident() out << 'value="' << keyValue << '" ' } @@ -488,8 +515,9 @@ class FormTagLib { } } else { - out << "value=\"${el}\" " - if(el == value) { + keyValue = el + out << "value=\"${keyValue}\" " + if(keyValue == value) { out << 'selected="selected" ' } } @@ -502,6 +530,19 @@ class FormTagLib { out << el.properties[optionValue].toString().encodeAsHTML() } } + else if(valueMessagePrefix) { + def message = messageSource.getMessage("${valueMessagePrefix}.${keyValue}", null, null, locale) + if(message) { + out << message.encodeAsHTML() + } + else if (keyValue) { + out << keyValue.encodeAsHTML() + } + else { + def s = el.toString() + if(s) out << s.encodeAsHTML() + } + } else { def s = el.toString() if(s) out << s.encodeAsHTML() @@ -554,6 +595,6 @@ class FormTagLib { outputAttributes(attrs) // close the tag, with no body - out << ' ></input>' + out << ' />' } } \ No newline at end of file racetrack_ch3/plugins/core/grails-app/taglib/FormTagLib.groovy @@ -95,7 +95,7 @@ class JavascriptTagLib { } else { out.println '<script type="text/javascript">' - body() + out << body() out.println '</script>' } } @@ -137,15 +137,15 @@ class JavascriptTagLib { /** * A link to a remote uri that used the prototype library to invoke the link via ajax */ - def remoteLink = { attrs, body -> + def remoteLink = { attrs, body -> out << "<a href=\"" def cloned = deepClone(attrs) - createLink(cloned) + out << createLink(cloned) out << "\" onclick=\"" // create remote function - remoteFunction(attrs) + out << remoteFunction(attrs) attrs.remove('url') out << "return false;\" " // process remaining attributes @@ -154,7 +154,7 @@ class JavascriptTagLib { } out << ">" // output the body - body() + out << body() // close tag out << "</a>" @@ -180,7 +180,7 @@ class JavascriptTagLib { else { attrs.params = "'${paramName}='+this.value" } - remoteFunction(attrs) + out << remoteFunction(attrs) attrs.remove('params') out << "\"" attrs.remove('url') @@ -208,16 +208,16 @@ class JavascriptTagLib { // prepare form settings prepareAjaxForm(p,attrs) - def params = [ onsubmit:TagLibUtil.outToString(remoteFunction,attrs) + 'return false', + def params = [ onsubmit:remoteFunction(attrs) + 'return false', method: (attrs.method? attrs.method : 'POST' ), - action: (attrs.action? attrs.action : TagLibUtil.outToString(createLink,url)) + action: (attrs.action? attrs.action : createLink(url)) ] attrs.remove('url') params.putAll(attrs) if(params.name && !params.id) params.id = params.name - withTag(name:'form',attrs:params) { - body() + out << withTag(name:'form',attrs:params) { + out << body() } } @@ -230,7 +230,7 @@ class JavascriptTagLib { // prepare form settings attrs.forSubmitTag = ".form" prepareAjaxForm(p,attrs) - def params = [ onclick:TagLibUtil.outToString(remoteFunction,attrs) + 'return false', + def params = [ onclick:remoteFunction(attrs) + 'return false', type: 'button', name: attrs.remove('name'), value: attrs.remove('value'), @@ -238,8 +238,8 @@ class JavascriptTagLib { 'class':attrs.remove('class') ] - withTag(name:'input', attrs:params) { - body() + out << withTag(name:'input', attrs:params) { + out << body() } } @@ -275,7 +275,7 @@ class JavascriptTagLib { def sw = new StringWriter() out = new PrintWriter(out) // invoke body - body() + out << body() // restore out out = tmp js = sw.toString() @@ -357,10 +357,10 @@ class PrototypeProvider implements JavascriptProvider { def pms = attrs.remove('params') if(attrs.url) { - taglib.createLink(attrs.url) + out << taglib.createLink(attrs.url) } else { - taglib.createLink(attrs) + out << taglib.createLink(attrs) } @@ -415,6 +415,7 @@ class PrototypeProvider implements JavascriptProvider { case 'true': ajaxOptions << "${k}:${v}"; break; case 'false': ajaxOptions << "${k}:${v}"; break; case ~/\s*function(\w*)\s*/: ajaxOptions << "${k}:${v}"; break; + case ~/Insertion\..*/: ajaxOptions << "${k}:${v}"; break; default:ajaxOptions << "${k}:'${v}'"; break; } } @@ -441,10 +442,10 @@ class YahooProvider implements JavascriptProvider { out << "YAHOO.util.Connect.asyncRequest('${method}','" if(attrs.url) { - taglib.createLink(attrs.url) + out << taglib.createLink(attrs.url) } else { - taglib.createLink(attrs) + out << taglib.createLink(attrs) } attrs.remove('url') out << "'," @@ -504,7 +505,7 @@ class DojoProvider implements JavascriptProvider { } out << 'dojo.io.bind({url:\'' - taglib.createLink(attrs) + out << taglib.createLink(attrs) attrs.remove('params') out << '\',load:function(type,data,evt) {' if(attrs.onLoaded) { racetrack_ch3/plugins/core/grails-app/taglib/JavascriptTagLib.groovy @@ -25,6 +25,7 @@ import org.springframework.web.servlet.support.RequestContextUtils as RCU; import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU; class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants { + def out // to facilitate testing protected getPage() { return request[PAGE] @@ -91,7 +92,7 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants } } if(invokeBody) { - body(); + out << body() } } } @@ -134,54 +135,183 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants if(attrs.total == null) throwTagError("Tag [paginate] is missing required attribute [total]") - def mkp = new groovy.xml.MarkupBuilder(out) + def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource") + def locale = RCU.getLocale(request) + def total = attrs.total.toInteger() - def max = params.max?.toInteger() - def offset = params.offset?.toInteger() def action = (attrs.action? attrs.action : 'list') - def breadcrumb = true - if(attrs.breadcrumb) breadcrumb = Boolean.valueOf(attrs.breadcrumb) - + def offset = params.offset?.toInteger() + def max = params.max?.toInteger() + def maxsteps = (attrs.maxsteps ? attrs.maxsteps.toInteger() : 10) + + if(attrs.breadcrumb) { + log.warn("Tag [paginate] includes the [breadcrumb] attribute. This attribute is deprecated and will be removed in the future. Please update your code to use the [maxsteps] attribute instead.") + } + + if(!offset) offset = (attrs.offset ? attrs.offset.toInteger() : 0) if(!max) max = (attrs.max ? attrs.max.toInteger() : 10) - if(!offset) offset = (attrs.offset ? attrs.offset.toInteger() : 0) - def linkParams = [offset:offset-max,max:max] - def linkTagAttrs = ['class':'prevLink',action:action] + def linkParams = [offset:offset - max, max:max] + if(params.sort) linkParams.sort = params.sort + if(params.order) linkParams.order = params.order + if(attrs.params) linkParams.putAll(attrs.params) + + def linkTagAttrs = [action:action] if(attrs.controller) { linkTagAttrs.controller = attrs.controller } if(attrs.id) { linkTagAttrs.id = attrs.id } - if(attrs.params)linkParams.putAll(attrs.params) linkTagAttrs.params = linkParams - - def combined = max + offset - if(offset > 0) { - link(linkTagAttrs.clone(),{out<< (attrs.prev? attrs.prev : 'Previous' ) }) + + // determine paging variables + def steps = maxsteps > 0 + int currentstep = (offset / max) + 1 + int firststep = 1 + int laststep = Math.round(Math.ceil(total / max)) + + // display previous link when not on firststep + if(currentstep > firststep) { + linkTagAttrs.class = 'prevLink' + out << link(linkTagAttrs.clone()) { + (attrs.prev ? attrs.prev : messageSource.getMessage('default.paginate.prev', null, 'Previous', locale)) + } } - if(total > max) { - linkTagAttrs.'class' = 'step' - if(breadcrumb) { - def j = 0 - 0.step(total,max) { i -> - if(offset == i) { - mkp.a('class':'step',"${++j}") - } - else { - linkParams.offset=i - link(linkTagAttrs.clone(),{out<<++j}) - } - } + // display steps when steps are enabled and laststep is not firststep + if(steps && laststep > firststep) { + linkTagAttrs.class = 'step' + + // determine begin and endstep paging variables + int beginstep = currentstep - Math.round(maxsteps / 2) + (maxsteps % 2) + int endstep = currentstep + Math.round(maxsteps / 2) - 1 + + if(beginstep < firststep) { + beginstep = firststep + endstep = maxsteps + } + if(endstep > laststep) { + beginstep = laststep - maxsteps + 1 + if(beginstep < firststep) { + beginstep = firststep + } + endstep = laststep + } + + // display firststep link when beginstep is not firststep + if(beginstep > firststep) { + linkParams.offset = 0 + out << link(linkTagAttrs.clone()) {firststep.toString()} + out << '<span class="step">..</span>' + } + + // display paginate steps + (beginstep..endstep).each { i -> + if(currentstep == i) { + out << "<span class=\"currentStep\">${i}</span>" + } + else { + linkParams.offset = (i - 1) * max + out << link(linkTagAttrs.clone()) {i.toString()} + } + } + + // display laststep link when endstep is not laststep + if(endstep < laststep) { + out << '<span class="step">..</span>' + linkParams.offset = (laststep -1) * max + out << link(linkTagAttrs.clone()) { laststep.toString() } + } + } + + // display next link when not on laststep + if(currentstep < laststep) { + linkTagAttrs.class = 'nextLink' + linkParams.offset = offset + max + out << link(linkTagAttrs.clone()) { + (attrs.next ? attrs.next : messageSource.getMessage('default.paginate.next', null, 'Next', locale)) } } - linkParams.offset = offset+max - if(combined < total) { - linkTagAttrs.'class'='nextLink' - link(linkTagAttrs,{out<< (attrs.'next'? attrs.'next' : 'Next' )}) + + } + + /** + * Renders a sortable column to support sorting in list views + * + * Attributes: + * + * property - name of the property relating to the field + * defaultOrder (optional) - default order for the property; choose between asc (default if not provided) and desc + * title (optional*) - title caption for the column + * titleKey (optional*) - title key to use for the column, resolved against the message source + * params (optional) - a map containing request parameters + * + * Attribute title or titleKey is required. When both attributes are specified then titleKey takes precedence, + * resulting in the title caption to be resolved against the message source. In case when the message could + * not be resolved, the title will be used as title caption. + * + * Examples: + * + * <g:sortableColumn property="title" title="Title" /> + * <g:sortableColumn property="title" title="Title" style="width: 200px" /> + * <g:sortableColumn property="title" titleKey="book.title" /> + * <g:sortableColumn property="releaseDate" defaultOrder="desc" title="Release Date" /> + * <g:sortableColumn property="releaseDate" defaultOrder="desc" title="Release Date" titleKey="book.releaseDate" /> + */ + def sortableColumn = { attrs -> + + if(!attrs.property) + throwTagError("Tag [sortableColumn] is missing required attribute [property]") + + if(!attrs.title && !attrs.titleKey) + throwTagError("Tag [sortableColumn] is missing required attribute [title] or [titleKey]") + + def property = attrs.remove("property") + def action = attrs.action ? attrs.remove("action") : "list" + + def defaultOrder = attrs.remove("defaultOrder") + if(defaultOrder != "desc") defaultOrder = "asc" + + // current sorting property and order + def sort = params.sort + def order = params.order + + // add sorting property and params to link params + def linkParams = [sort:property] + if(attrs.params) linkParams.putAll(attrs.params) + + // determine and add sorting order for this column to link params + attrs.class = "sortable" + if(property == sort) { + attrs.class = attrs.class + " sorted " + order + if(order == "asc") { + linkParams.order = "desc" + } + else { + linkParams.order = "asc" + } + } + else { + linkParams.order = defaultOrder + } + + // determine column title + def title = attrs.remove("title") + def titleKey = attrs.remove("titleKey") + if(titleKey) { + if(!title) title = titleKey + def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource") + def locale = RCU.getLocale(request) + title = messageSource.getMessage(titleKey, null, title, locale) } + out << "<th " + // process remaining attributes + attrs.each { k, v -> + out << "${k}=\"${v.encodeAsHTML()}\" " + } + out << ">${link(action:action, params:linkParams) { title }}</th>" } /** @@ -199,14 +329,7 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants def uri = grailsAttributes.getTemplateUri(attrs.template,request) def var = attrs['var'] - def url = servletContext.getResource(uri) - if(!url) - throwTagError("No template found for name [${attrs.template}] in tag [render]") - - def t = engine.createTemplate( uri, - servletContext, - request, - response) + def t = engine.createTemplate( uri ) if(attrs.model instanceof Map) { t.make( attrs.model ).writeTo(out) @@ -246,14 +369,7 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants def engine = grailsAttributes.getPagesTemplateEngine() def uri = grailsAttributes.getTemplateUri(attrs.template,request) - def url = servletContext.getResource(uri) - if(!url) - throwTagError("No template found for name [${attrs.template}] in tag [include]") - - def t = engine.createTemplate( uri, - servletContext, - request, - response) + def t = engine.createTemplate( uri ) t.make().writeTo(out) } racetrack_ch3/plugins/core/grails-app/taglib/RenderTagLib.groovy @@ -152,7 +152,7 @@ class UITagLib { * <g:richTextEditor name="editor" height="400" /> */ def richTextEditor = { attrs -> - withTag(name:'script',attributes:[type:'text/javascript']) { + out << withTag(name:'script',attributes:[type:'text/javascript']) { if(attrs.onComplete) { out.println "function FCKeditor_OnComplete( editorInstance ) {" out.println "${attrs.onComplete}(editorInstance);" @@ -162,24 +162,53 @@ class UITagLib { var oFCKeditor = new FCKeditor( '${attrs.name}' ) ; oFCKeditor.BasePath = \"""" if(attrs.basepath) { - createLinkTo(dir:attrs.basepath) + out << createLinkTo(dir:attrs.basepath) } else { - createLinkTo(dir:"fckeditor/") + out << createLinkTo(dir:"fckeditor/") } out.println '";' if(attrs.toolbar) { out << "oFCKeditor.ToolbarSet = '${attrs.toolbar}';" - } + } + // add width support + if(attrs.width) + out.println "oFCKeditor.Width = '${attrs.width}';" + if(attrs.height) - out.println "oFCKeditor.Height = ${attrs.height};" + out.println "oFCKeditor.Height = '${attrs.height}';" + + // add skin support, values to choose: "default", "office2003", "silver" + if(attrs.skin) + out.println "oFCKeditor.Config['SkinPath'] = 'skins/${attrs.skin}/';" + + // check the browser compatibility when rendering the editor. default value: true, values to choose: true, false, + if(attrs.checkBrowser) + out.println "oFCKeditor.CheckBrowser = ${attrs.checkBrowser};" + + // show error messages on errors while rendering the editor. default value: true, values to choose: true, false + if(attrs.displayErrors) + out.println "oFCKeditor.DisplayErrors = ${attrs.displayErrors};" + + // oFCKeditor.Config AutoDetectLanguage:true/false, DefaultLanguage:'pt-BR' and so on + if(attrs.config) { + if (attrs.config instanceof Map) { + attrs.config.each { k, v -> + out.println "oFCKeditor.Config['$k'] = '$v';" + } + } else { + throw new Exception("""The format of config is not correct, it should be like "[AutoDetectLanguage:false, DefaultLanguage:'pt-BR']" """) + } + } + if(attrs.value) { out << "oFCKeditor.Value = \"" - escapeJavascript(Collections.EMPTY_MAP,attrs.value) + out << escapeJavascript(Collections.EMPTY_MAP,attrs.value) out.println "\" ;" } - out.println "oFCKeditor.Create();" + out.println "oFCKeditor.Create();" + } } } \ No newline at end of file racetrack_ch3/plugins/core/grails-app/taglib/UITagLib.groovy @@ -32,9 +32,7 @@ class ValidationTagLib { def model = attrs['model'] def checkList = [] if(model) { - checkList = model.findAll { k,v -> - return ((v.errors != null) && (v.errors instanceof Errors)) - } + checkList = model.findAll { it.value?.errors instanceof Errors }.collect { it.value } } if(attrs['bean']) { checkList << attrs['bean'] @@ -45,7 +43,7 @@ class ValidationTagLib { if(ra) { if(ra instanceof Errors) checkList << ra - else if ((ra.properties.errors) && (ra.errors instanceof Errors)) { + else if (ra.properties?.errors instanceof Errors) { checkList << ra } } @@ -55,23 +53,29 @@ class ValidationTagLib { for(i in checkList) { def errors = null - if(i instanceof Errors) { + if (i instanceof Errors) { errors = i } - else { - if ((i.errors != null) && (i.errors instanceof Errors)) { - if (i.hasErrors()) - errors = i.errors - } + else { + try { + if ((i.errors != null) && (i.errors instanceof Errors)) { + if (i.hasErrors()) + errors = i.errors + } + + } + catch(MissingPropertyException mpe) { + // ignore + } } if(errors) { if(attrs['field']) { if(errors.hasFieldErrors(attrs['field'])) { - body() + out << body() } } else { - body() + out << body() } } } @@ -84,9 +88,7 @@ class ValidationTagLib { def model = attrs['model'] def errorList = [] if(model) { - errorList = model.findAll { k,v -> - return ((v.errors != null) && (v.errors instanceof Errors)) - } + errorList = model.findAll { it.value?.errors instanceof Errors }.collect { it.value } } if(attrs['bean']) { errorList << attrs['bean'] @@ -95,9 +97,9 @@ class ValidationTagLib { request.attributeNames.each { def ra = request[it] if(ra) { - if(ra instanceof Errors) + if (ra instanceof Errors) errorList << ra - else if ((ra.errors != null) && (ra.errors instanceof Errors)) { + else if (ra.properties?.errors instanceof Errors) { errorList << ra } } @@ -119,13 +121,13 @@ class ValidationTagLib { if(attrs['field']) { if(errors.hasFieldErrors(attrs['field'])) { errors.getFieldErrors( attrs["field"] ).each { - body(it) + out << body(it) } } } else { errors.allErrors.each { - body( it ) + out << body( it ) } } } @@ -141,9 +143,9 @@ class ValidationTagLib { if(renderAs == 'list') { out << "<ul>" - eachError(attrs, { + out << eachError(attrs, { out << "<li>" - message(error:it) + out << message(error:it) out << "</li>" } ) @@ -219,7 +221,7 @@ class ValidationTagLib { } def app = grailsAttributes.getGrailsApplication() - def dc = app.getGrailsDomainClass(againstClass) + def dc = app.getDomainClass(againstClass) if(!dc) throwTagError("Tag [validate] could not find a domain class to validate against for name [${againstClass}]") racetrack_ch3/plugins/core/grails-app/taglib/ValidationTagLib.groovy @@ -8,7 +8,7 @@ class URLCodec { } static decode = { obj -> - URLEncoder.decode(obj.toString(), URLCodec.getEncoding()) + URLDecoder.decode(obj.toString(), URLCodec.getEncoding()) } private static def getEncoding() { racetrack_ch3/plugins/core/grails-app/utils/URLCodec.groovy @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> - -<beans> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> </beans> \ No newline at end of file racetrack_ch3/spring/resources.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> -<beans> <bean id="grailsApplication" class="org.codehaus.groovy.grails.commons.GrailsApplicationFactoryBean"> <description>Grails application factory bean</description> <property name="groovyFiles"> @@ -25,7 +27,7 @@ <property name="pluginManager" ref="pluginManager" /> </bean> - <bean id="grailsResourceHolder" singleton="false" class="org.codehaus.groovy.grails.commons.spring.GrailsResourceHolder"> + <bean id="grailsResourceHolder" scope="prototype" class="org.codehaus.groovy.grails.commons.spring.GrailsResourceHolder"> <property name="resources"> <value>classpath*:**/grails-app/**/*.groovy</value> </property> racetrack_ch3/web-app/WEB-INF/applicationContext.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> - -<beans> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> </beans> \ No newline at end of file racetrack_ch3/web-app/WEB-INF/spring/resources.xml @@ -10,6 +10,254 @@ <uri>http://grails.codehaus.org/tags</uri> <tag> + <description> + Enables the storing of a value into the given ${var} + </description> + <name>set</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovySetTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The value to store</description> + <name>value</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The name of the variable to store the value in</description> + <name>var</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Enables the storing of a value into the given ${var} into the page context + </description> + <name>def</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyDefTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The value to store</description> + <name>value</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The name of the variable to store the value in</description> + <name>var</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Logical if tag to test whether the given condition is true + </description> + <name>if</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyIfTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The condition to test</description> + <name>test</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Logical else tag as fallback if the if condition fails + </description> + <name>else</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyElseTag</tag-class> + <body-content>JSP</body-content> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Logical elseif tag to test whether the given condition is true + </description> + <name>elseif</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyElseIfTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The condition to test</description> + <name>test</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Tag to loop over a collection while the test expression returns true + </description> + <name>while</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyWhileTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The condition to test</description> + <name>test</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection</description> + <name>each</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyEachTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>true</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection</description> + <name>findAll</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyFindAllTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The expression to filter the elements to iterate over</description> + <name>expr</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>true</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection and collects the elements + you want to work with</description> + <name>collect</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyCollectTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The expression to use to collect the elements. The + expression must retur true to add the element to the + collection</description> + <name>expr</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection and filters the elements + with a regular expression</description> + <name>grep</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyGrepTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The regular expression to filter the element with. The + filter is a simple Groovy Regex</description> + <name>filter</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description>A tag that attempts to render an input for a bean property + into an appropriate component based on the type. It uses the templates + defined in "grails-app/views/scaffolding" to achieve this by looking up + the template by type.</description> + <name>renderInput</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyRenderInputTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The Bean to render the input for</description> + <name>bean</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The property of the bean to render input for</description> + <name>property</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> <name>link</name> <tag-class>org.codehaus.groovy.grails.web.taglib.jsp.JspLinkTag</tag-class> <body-content>JSP</body-content> racetrack_ch3/web-app/WEB-INF/tld/grails.tld @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" racetrack_ch3/web-app/WEB-INF/web.template.xml @@ -1,4 +1,4 @@ -<web-app xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd' version='2.4' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://java.sun.com/xml/ns/j2ee'><context-param><param-name>log4jConfigLocation</param-name><param-value>/WEB-INF/classes/log4j.properties</param-value></context-param><context-param><param-name>contextConfigLocation</param-name><param-value>/WEB-INF/applicationContext.xml</param-value></context-param><context-param><param-name>webAppRootKey</param-name><param-value>racetrack</param-value></context-param><filter><filter-name>sitemesh</filter-name><filter-class>org.codehaus.groovy.grails.web.sitemesh.GrailsPageFilter</filter-class></filter><filter><filter-name>charEncodingFilter</filter-name><filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class><init-param><param-name>targetBeanName</param-name><param-value>characterEncodingFilter</param-value></init-param><init-param><param-name>targetFilterLifecycle</param-name><param-value>true</param-value></init-param></filter><filter><filter-name>grailsWebRequest</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequestFilter</filter-class></filter><filter><filter-name>reloadFilter</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.filter.GrailsReloadServletFilter</filter-class></filter><filter-mapping><filter-name>charEncodingFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>grailsWebRequest</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>sitemesh</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>reloadFilter</filter-name><url-pattern>/registration/*</url-pattern></filter-mapping><filter-mapping><filter-name>reloadFilter</filter-name><url-pattern>/race/*</url-pattern></filter-mapping><listener><listener-class>org.springframework.web.util.Log4jConfigListener</listener-class></listener><listener><listener-class>org.codehaus.groovy.grails.web.context.GrailsContextLoaderListener</listener-class></listener><servlet><servlet-name>grails</servlet-name><servlet-class>org.codehaus.groovy.grails.web.servlet.GrailsDispatcherServlet</servlet-class><load-on-startup>1</load-on-startup></servlet><servlet><servlet-name>gsp</servlet-name><servlet-class>org.codehaus.groovy.grails.web.pages.GroovyPagesServlet</servlet-class><init-param><description> +<web-app xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd' version='2.4' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://java.sun.com/xml/ns/j2ee'><context-param><param-name>log4jConfigLocation</param-name><param-value>/WEB-INF/classes/log4j.properties</param-value></context-param><context-param><param-name>log4jRefreshInterval</param-name><param-value>1000</param-value></context-param><context-param><param-name>contextConfigLocation</param-name><param-value>/WEB-INF/applicationContext.xml</param-value></context-param><context-param><param-name>webAppRootKey</param-name><param-value>racetrack</param-value></context-param><filter><filter-name>sitemesh</filter-name><filter-class>org.codehaus.groovy.grails.web.sitemesh.GrailsPageFilter</filter-class></filter><filter><filter-name>charEncodingFilter</filter-name><filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class><init-param><param-name>targetBeanName</param-name><param-value>characterEncodingFilter</param-value></init-param><init-param><param-name>targetFilterLifecycle</param-name><param-value>true</param-value></init-param></filter><filter><filter-name>grailsWebRequest</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequestFilter</filter-class></filter><filter><filter-name>urlMapping</filter-name><filter-class>org.codehaus.groovy.grails.web.mapping.filter.UrlMappingsFilter</filter-class></filter><filter><filter-name>reloadFilter</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.filter.GrailsReloadServletFilter</filter-class></filter><filter-mapping><filter-name>charEncodingFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>grailsWebRequest</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>reloadFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>sitemesh</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>urlMapping</filter-name><url-pattern>/*</url-pattern></filter-mapping><listener><listener-class>org.springframework.web.util.Log4jConfigListener</listener-class></listener><listener><listener-class>org.codehaus.groovy.grails.web.context.GrailsContextLoaderListener</listener-class></listener><servlet><servlet-name>grails</servlet-name><servlet-class>org.codehaus.groovy.grails.web.servlet.GrailsDispatcherServlet</servlet-class><load-on-startup>1</load-on-startup></servlet><servlet><servlet-name>gsp</servlet-name><servlet-class>org.codehaus.groovy.grails.web.pages.GroovyPagesServlet</servlet-class><init-param><description> Allows developers to view the intermediade source code, when they pass - a spillGroovy argument in the URL. - </description><param-name>showSource</param-name><param-value>1</param-value></init-param></servlet><servlet-mapping><servlet-name>gsp</servlet-name><url-pattern>*.gsp</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>/registration/*</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>/race/*</url-pattern></servlet-mapping><welcome-file-list><welcome-file>index.jsp</welcome-file><welcome-file>index.gsp</welcome-file></welcome-file-list><jsp-config><taglib><taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri><taglib-location>/WEB-INF/tld/c.tld</taglib-location></taglib><taglib><taglib-uri>http://java.sun.com/jsp/jstl/fmt</taglib-uri><taglib-location>/WEB-INF/tld/fmt.tld</taglib-location></taglib><taglib><taglib-uri>http://www.springframework.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/spring.tld</taglib-location></taglib><taglib><taglib-uri>http://grails.codehaus.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/grails.tld</taglib-location></taglib></jsp-config></web-app> \ No newline at end of file + a spillGroovy argument in the URL. + </description><param-name>showSource</param-name><param-value>1</param-value></init-param></servlet><servlet-mapping><servlet-name>gsp</servlet-name><url-pattern>*.gsp</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>*.dispatch</url-pattern></servlet-mapping><welcome-file-list><welcome-file>index.jsp</welcome-file><welcome-file>index.gsp</welcome-file></welcome-file-list><jsp-config><taglib><taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri><taglib-location>/WEB-INF/tld/c.tld</taglib-location></taglib><taglib><taglib-uri>http://java.sun.com/jsp/jstl/fmt</taglib-uri><taglib-location>/WEB-INF/tld/fmt.tld</taglib-location></taglib><taglib><taglib-uri>http://www.springframework.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/spring.tld</taglib-location></taglib><taglib><taglib-uri>http://grails.codehaus.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/grails.tld</taglib-location></taglib></jsp-config></web-app> \ No newline at end of file racetrack_ch3/web-app/WEB-INF/web.xml @@ -124,4 +124,15 @@ td .errors { .prop .value { text-align:left; width:80%; +} + +.prevLink, .step, .currentStep, .nextLink { + padding-right: 5px; +} +.currentStep { + font-weight:bold; +} + +th.sorted a, th.sorted a:link, th.sorted a:visited, th.sorted a:hover, th.sortable a, th.sortable a:link, th.sortable a:visited, th.sortable a:hover { + color: white; } \ No newline at end of file racetrack_ch3/web-app/css/main.css @@ -10,7 +10,9 @@ <classpathentry kind="src" path="grails-tests"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="var" path="GRAILS_HOME/ant/lib/ant.jar"/> - <classpathentry kind="var" path="GRAILS_HOME/lib/ant-nodeps.jar" /> + <classpathentry kind="var" path="GRAILS_HOME/lib/ant-junit.jar" /> + +<classpathentry kind="var" path="GRAILS_HOME/lib/ant-nodeps.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/ant.jar" /> @@ -48,9 +50,9 @@ <classpathentry kind="var" path="GRAILS_HOME/lib/ejb3-persistence.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/gant-0.2.2-SNAPSHOT.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/gant-0.2.5-SNAPSHOT.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/groovy-all-1.0.1-SNAPSHOT.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/groovy-all-1.1-BETA-1.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/groovy-starter.jar" /> @@ -80,13 +82,13 @@ <classpathentry kind="var" path="GRAILS_HOME/lib/log4j-1.2.8.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/ognl-2.7.jar" /> - <classpathentry kind="var" path="GRAILS_HOME/lib/org.mortbay.jetty.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/oro-2.0.8.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/quartz-1.5.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/quartz-1.6.0.jar" /> + +<classpathentry kind="var" path="GRAILS_HOME/lib/serializer.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/servletapi-2.4.jar" /> @@ -106,18 +108,20 @@ <classpathentry kind="var" path="GRAILS_HOME/lib/standard-2.4.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/xalan.jar" /> + <classpathentry kind="var" path="GRAILS_HOME/lib/xerces-2.6.2.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/xml-apis.jar" /> - <classpathentry kind="var" path="GRAILS_HOME/dist/grails-core-0.4.2.jar" /> + <classpathentry kind="var" path="GRAILS_HOME/dist/grails-core-0.5.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/dist/grails-crud-0.4.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/dist/grails-crud-0.5.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/dist/grails-gorm-0.4.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/dist/grails-gorm-0.5.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/dist/grails-web-0.4.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/dist/grails-web-0.5.jar" /> <classpathentry kind="output" path="web-app/WEB-INF/classes"/> racetrack_ch4/.classpath @@ -1,4 +1,4 @@ -#Do not edit app.grails.* properties, they may change automatically. DO NOT put application configuration in here, it is not the right place! -#Sun Mar 11 15:49:46 EDT 2007 -app.grails.version=0.4.2 +#Wed May 02 20:22:50 EDT 2007 +app.version=0.1 +app.grails.version=0.5 app.name=racetrack racetrack_ch4/application.properties @@ -1,8 +1,8 @@ -class DevelopmentDataSource { +class DevelopmentDataSource { boolean pooling = true String dbCreate = "update" String url = "jdbc:mysql://localhost/racetrack_dev" String driverClassName = "com.mysql.jdbc.Driver" String username = "jason" String password = "" -} +} racetrack_ch4/grails-app/conf/DevelopmentDataSource.groovy @@ -4,7 +4,28 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.rootLogger=error, stdout -# Enable this logger to log Hibernate output +# This logger is for your own application artefact logs +# Artefacts are logged by their type and optionally class name i.e: +# +# log4j.logger.grails.app.controller.HelloController=debug, stdout +# ...will control the logs from just that controller +# +# log4j.logger.grails.app.domain=trace, stdout +# ...will control the logs for all domain classes +# +# At the time of writing, supported artefact type ids include: +# domain (aka Domain Class), task (aka Job), service, dataSource, +# controller, tagLib, urlMappings, codec, bootstrap +# +# The default "info" level for all artefacts is set here +log4j.logger.grails.app=info,stdout +log4j.additivity.grails.app=false + +## This logger is for Grails' public APIs within the grails. package +log4j.logger.grails=info,stdout +log4j.additivity.grails=false + +## Enable this logger to log Hibernate output # handy to see its database interaction activity #log4j.logger.org.hibernate=debug,stdout #log4j.additivity.org.hibernate=false @@ -37,7 +58,3 @@ log4j.logger.org.codehaus.groovy.grails.plugins=info,stdout log4j.additivity.org.codehaus.groovy.grails.plugins=false log4j.logger.grails.spring=info,stdout log4j.additivity.grails.spring=false - -# This logger is for Grails' public APIs within the grails. package -log4j.logger.grails=info,stdout -log4j.additivity.grails=false racetrack_ch4/grails-app/conf/log4j.development.properties @@ -4,7 +4,28 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.rootLogger=error, stdout -# Enable this logger to log Hibernate output +# This logger is for your own application artefact logs +# Artefacts are logged by their type and optionally class name i.e: +# +# log4j.logger.grails.app.controller.HelloController=debug, stdout +# ...will control the logs from just that controller +# +# log4j.logger.grails.app.domain=trace, stdout +# ...will control the logs for all domain classes +# +# At the time of writing, supported artefact type ids include: +# domain (aka Domain Class), task (aka Job), service, dataSource, +# controller, tagLib, urlMappings, codec, bootstrap +# +# The default "info" level for all artefacts is set here +log4j.logger.grails.app=info,stdout +log4j.additivity.grails.app=false + +## This logger is for Grails' public APIs within the grails. package +log4j.logger.grails=info,stdout +log4j.additivity.grails=false + +## Enable this logger to log Hibernate output # handy to see its database interaction activity #log4j.logger.org.hibernate=debug,stdout #log4j.additivity.org.hibernate=false @@ -37,7 +58,3 @@ log4j.logger.org.codehaus.groovy.grails.plugins=info,stdout log4j.additivity.org.codehaus.groovy.grails.plugins=false log4j.logger.grails.spring=info,stdout log4j.additivity.grails.spring=false - -# This logger is for Grails' public APIs within the grails. package -log4j.logger.grails=info,stdout -log4j.additivity.grails=false racetrack_ch4/grails-app/conf/log4j.production.properties @@ -4,7 +4,28 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.rootLogger=error, stdout -# Enable this logger to log Hibernate output +# This logger is for your own application artefact logs +# Artefacts are logged by their type and optionally class name i.e: +# +# log4j.logger.grails.app.controller.HelloController=debug, stdout +# ...will control the logs from just that controller +# +# log4j.logger.grails.app.domain=trace, stdout +# ...will control the logs for all domain classes +# +# At the time of writing, supported artefact type ids include: +# domain (aka Domain Class), task (aka Job), service, dataSource, +# controller, tagLib, urlMappings, codec, bootstrap +# +# The default "info" level for all artefacts is set here +log4j.logger.grails.app=info,stdout +log4j.additivity.grails.app=false + +## This logger is for Grails' public APIs within the grails. package +log4j.logger.grails=info,stdout +log4j.additivity.grails=false + +## Enable this logger to log Hibernate output # handy to see its database interaction activity #log4j.logger.org.hibernate=debug,stdout #log4j.additivity.org.hibernate=false @@ -37,7 +58,3 @@ log4j.logger.org.codehaus.groovy.grails.plugins=info,stdout log4j.additivity.org.codehaus.groovy.grails.plugins=false log4j.logger.grails.spring=info,stdout log4j.additivity.grails.spring=false - -# This logger is for Grails' public APIs within the grails. package -log4j.logger.grails=info,stdout -log4j.additivity.grails=false racetrack_ch4/grails-app/conf/log4j.test.properties @@ -46,8 +46,8 @@ class RaceController { def race = Race.get( params.id ) if(race) { race.properties = params - if(race.save()) { - flash.message = "${params.name} updated." + if(race.save()) { + flash.message = "${params.name} updated." redirect(action:show,id:race.id) } else { @@ -70,7 +70,7 @@ class RaceController { def race = new Race() race.properties = params if(race.save()) { - flash.message = "${params.name} saved." + flash.message = "${params.name} saved." redirect(action:show,id:race.id) } else { racetrack_ch4/grails-app/controllers/RaceController.groovy @@ -47,7 +47,7 @@ class RegistrationController { if(registration) { registration.properties = params if(registration.save()) { - flash.message = "${params.name} updated." + flash.message = "${params.name} updated." redirect(action:show,id:registration.id) } else { @@ -70,7 +70,7 @@ class RegistrationController { def registration = new Registration() registration.properties = params if(registration.save()) { - flash.message = "${params.name} saved." + flash.message = "${params.name} saved." redirect(action:show,id:registration.id) } else { racetrack_ch4/grails-app/controllers/RegistrationController.groovy @@ -1,4 +1,4 @@ -class Race { +class Race { String name Date startDateTime String city @@ -7,16 +7,16 @@ class Race { Float cost Integer maxRunners = 100000 - static hasMany = [registrations:Registration] + static hasMany = [registrations:Registration] static constraints = { - name(maxLength:50,blank:false) - startDateTime(validator: {return (it > new Date())}) - city(maxLength:30,blank:false) + name(maxSize:50,blank:false) + startDateTime(validator: {return (it > new Date())}) + city(maxSize:30,blank:false) state(inList:['GA', 'NC', 'SC', 'VA'],blank:false) distance(min:3.1f,max:100f) cost(min:0f,max:999.99f) - } + } - String toString() {"${this.name} : ${this.city}, ${this.state}"} -} \ No newline at end of file + String toString() {"${this.name} : ${this.city}, ${this.state}" } +} racetrack_ch4/grails-app/domain/Race.groovy @@ -1,4 +1,4 @@ -class Registration { +class Registration { Race race String name Date dateOfBirth @@ -6,19 +6,17 @@ class Registration { String postalAddress String emailAddress Date createdAt = new Date() - + static belongsTo = Race - - static optionals = ["postalAddress" ] - + static constraints = { - name(maxLength:50,blank:false) + name(maxSize:50,blank:false) dateOfBirth(nullable:false) gender(inList:["M", "F"]) - postalAddress(maxLength:255) - emailAddress(maxLength:50,email:true) + postalAddress(nullable:true,maxSize:255) + emailAddress(maxSize:50,email:true) race(nullable:false) } - - String toString() {"${this.name} : ${this.emailAddress}"} -} \ No newline at end of file + + String toString(){"${this.name}:${this.emailAddress}"} +} racetrack_ch4/grails-app/domain/Registration.groovy @@ -1,29 +1,28 @@ default.doesnt.match.message=Property [{0}] of class [{1}] with value [{2}] does not match the required pattern [{3}] default.invalid.url.message=Property [{0}] of class [{1}] with value [{2}] is not a valid URL default.invalid.creditCard.message=Property [{0}] of class [{1}] with value [{2}] is not a valid credit card number -default.invalid.email.message=Property [{0}] of class [{1}] with value [{2}] is not a valid e-mail address. -default.invalid.message=Property [{0}] of class [{1}] is not a valid [{2}]. +default.invalid.email.message=Property [{0}] of class [{1}] with value [{2}] is not a valid e-mail address default.invalid.range.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid range from [{3}] to [{4}] default.invalid.size.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid size range from [{3}] to [{4}] -default.invalid.length.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid size range from [{3}] to [{4}] -default.invalid.min.message=Property [{0}] of class [{1}] with value [{2}] is less than minimum value [{3}] default.invalid.max.message=Property [{0}] of class [{1}] with value [{2}] exceeds maximum value [{3}] -default.invalid.max.length.message=Property [{0}] of class [{1}] with value [{2}] exceeds the maximum size of [{3}] -default.invalid.min.length.message=Property [{0}] of class [{1}] with value [{2}] is less than the minimum size of [{3}] +default.invalid.min.message=Property [{0}] of class [{1}] with value [{2}] is less than minimum value [{3}] default.invalid.max.size.message=Property [{0}] of class [{1}] with value [{2}] exceeds the maximum size of [{3}] default.invalid.min.size.message=Property [{0}] of class [{1}] with value [{2}] is less than the minimum size of [{3}] +default.invalid.validator.message=Property [{0}] of class [{1}] with value [{2}] does not pass custom validation default.not.inlist.message=Property [{0}] of class [{1}] with value [{2}] is not contained within the list [{3}] default.blank.message=Property [{0}] of class [{1}] cannot be blank default.not.equal.message=Property [{0}] of class [{1}] with value [{2}] cannot equal [{3}] default.null.message=Property [{0}] of class [{1}] cannot be null default.not.unique.message=Property [{0}] of class [{1}] with value [{2}] must be unique -default.not.editable.message=Property [{0}] of class [{1}] with value [{2}] cannot be changed from [{3}] -race.name.blank=Please enter a name for this race +default.paginate.prev=Previous +default.paginate.next=Next + +race.name.blank=Please enter a name for this race race.distance.max.exceeded=Please enter a valid distance no more than {3} miles race.startDateTime.validator.invalid=Please enter a future date and time race.city.blank=Please enter a city for this race -race.city.maxLength.exceeded=Please limit the city name to a maximum length of {3} characters +race.city.maxSize.exceeded=Please limit the city name to a maximum length of {3} characters race.distance.nullable=Please enter a valid distance race.distance.min.notmet=Please enter a valid distance no fewer than {3} miles race.distance.max.exceeded=Please enter a valid distance no more than {3} miles @@ -32,8 +31,8 @@ race.cost.min.notmet=Please enter a valid cost of at least ${3} race.cost.max.exceeded=Please enter a valid cost no more than ${3} registration.name.blank=Please enter a name -registration.name.maxLength.exceeded=Please limit the name to a maximum length of {3} characters -registration.postalAddress.maxLength.exceeded=Please limit the postal address to a maximum length of {3} characters +registration.name.maxSize.exceeded=Please limit the name to a maximum length of {3} characters +registration.postalAddress.maxSize.exceeded=Please limit the postal address to a maximum length of {3} characters registration.emailAddress.blank=Please enter an e-mail address -registration.emailAddress.maxLength.exceeded=Please limit the e-mail address to a maximum length of {3} characters +registration.emailAddress.maxSize.exceeded=Please limit the e-mail address to a maximum length of {3} characters registration.emailAddress.email.invalid=Please enter a valid e-mail address \ No newline at end of file racetrack_ch4/grails-app/i18n/messages.properties @@ -27,19 +27,19 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='startDateTime'>Start Date Time:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'startDateTime','errors')}'><g:datePicker name='startDateTime' value="${race?.startDateTime}"></g:datePicker></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='state'>State:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'state','errors')}'><g:select name='state' from='${race.constraints.state.inList.collect{it.encodeAsHTML()}}' value="${race.state?.encodeAsHTML()}"></g:select></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}" /></td></tr> </tbody> </table> racetrack_ch4/grails-app/views/race/create.gsp @@ -30,19 +30,19 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='startDateTime'>Start Date Time:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'startDateTime','errors')}'><g:datePicker name='startDateTime' value="${race?.startDateTime}"></g:datePicker></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='state'>State:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'state','errors')}'><g:select name='state' from='${race.constraints.state.inList.collect{it.encodeAsHTML()}}' value="${race.state?.encodeAsHTML()}"></g:select></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}" /></td></tr> <tr class='prop'><td valign='top' class='name'><label for='registrations'>Registrations:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'registrations','errors')}'><ul> <g:each var='r' in='${race?.registrations?}'> racetrack_ch4/grails-app/views/race/edit.gsp @@ -20,17 +20,17 @@ <table> <thead> <tr> - <th>Name</th> - - <th>Start Date Time</th> - - <th>City</th> - - <th>State</th> - - <th>Distance</th> - - <th></th> + <g:sortableColumn property="name" title="Name" /> + + <g:sortableColumn property="startDateTime" title="Start Date Time" /> + + <g:sortableColumn property="city" title="City" /> + + <g:sortableColumn property="state" title="State" /> + + <g:sortableColumn property="distance" title="Distance" /> + + <th></th> </tr> </thead> <tbody> racetrack_ch4/grails-app/views/race/list.gsp @@ -1,7 +1,7 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <g:javascript library="racetrack" /> <meta name="layout" content="main" /> <title>Show Race</title> racetrack_ch4/grails-app/views/race/show.gsp @@ -27,7 +27,7 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='dateOfBirth'>Date Of Birth:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'dateOfBirth','errors')}'><g:datePicker name='dateOfBirth' value="${registration?.dateOfBirth}" precision='day'></g:datePicker></td></tr> @@ -35,12 +35,10 @@ <tr class='prop'><td valign='top' class='name'><label for='postalAddress'>Postal Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'postalAddress','errors')}'><textarea rows='5' cols='40' name='postalAddress'>${registration?.postalAddress?.encodeAsHTML()}</textarea></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='race'>Race:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'race','errors')}'><g:select optionKey="id" from="${Race.list()}" name='race.id' value="${registration?.race?.id}"></g:select></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='createdAt'>Created At:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'createdAt','errors')}'><g:datePicker name='createdAt' value="${registration?.createdAt}"></g:datePicker></td></tr> - </tbody> </table> </div> racetrack_ch4/grails-app/views/registration/create.gsp @@ -30,7 +30,7 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='dateOfBirth'>Date Of Birth:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'dateOfBirth','errors')}'><g:datePicker name='dateOfBirth' value="${registration?.dateOfBirth}" precision='day'></g:datePicker></td></tr> @@ -38,7 +38,7 @@ <tr class='prop'><td valign='top' class='name'><label for='postalAddress'>Postal Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'postalAddress','errors')}'><textarea rows='5' cols='40' name='postalAddress'>${registration?.postalAddress?.encodeAsHTML()}</textarea></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='race'>Race:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'race','errors')}'><g:select optionKey="id" from="${Race.list()}" name='race.id' value="${registration?.race?.id}"></g:select></td></tr> @@ -50,7 +50,7 @@ <div class="buttons"> <span class="button"><g:actionSubmit value="Update" /></span> - <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRaceDelete();"/></span> + <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRegistrationDelete();" /></span> </div> </g:form> </div> racetrack_ch4/grails-app/views/registration/edit.gsp @@ -20,17 +20,17 @@ <table> <thead> <tr> - <th>Name</th> - - <th>Date Of Birth</th> - - <th>Gender</th> - - <th>Postal Address</th> - - <th>Email Address</th> - - <th></th> + <g:sortableColumn property="name" title="Name" /> + + <g:sortableColumn property="dateOfBirth" title="Date Of Birth" /> + + <g:sortableColumn property="gender" title="Gender" /> + + <g:sortableColumn property="postalAddress" title="Postal Address" /> + + <g:sortableColumn property="emailAddress" title="Email Address" /> + + <th></th> </tr> </thead> <tbody> racetrack_ch4/grails-app/views/registration/list.gsp @@ -77,7 +77,7 @@ <g:form controller="registration"> <input type="hidden" name="id" value="${registration?.id}" /> <span class="button"><g:actionSubmit value="Edit" /></span> - <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRaceDelete();"/></span> + <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRegistrationDelete();" /></span> </g:form> </div> </div> racetrack_ch4/grails-app/views/registration/show.gsp @@ -25,7 +25,10 @@ import org.springframework.context.NoSuchMessageException; import org.springframework.web.servlet.support.RequestContextUtils as RCU; import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU; -class ApplicationTagLib { +class ApplicationTagLib { + + def grailsUrlMappingsHolder + /** * Creates a link to a resource, generally used as a method rather than a tag. * @@ -33,7 +36,7 @@ class ApplicationTagLib { */ def createLinkTo = { attrs -> out << grailsAttributes.getApplicationUri(request) - if(attrs['dir']) { + if(attrs['dir'] || attrs['dir'] == '') { out << "/${attrs['dir']}" } if(attrs['file']) { @@ -50,7 +53,7 @@ class ApplicationTagLib { def link = { attrs, body -> out << "<a href=\"" // create the link - createLink(attrs) + out << createLink(attrs) out << '\" ' // process remaining attributes @@ -59,7 +62,7 @@ class ApplicationTagLib { } out << ">" // output the body - body() + out << body() // close tag out << "</a>" @@ -79,29 +82,47 @@ class ApplicationTagLib { if(attrs['url']) { attrs = attrs.remove('url') } - // if the current attribute null set the controller uri to the current controller - if(attrs["controller"]) { - out << '/' << attrs.remove("controller") - } - else { - out << grailsAttributes.getControllerUri(request) - } - if(attrs["action"]) { - out << '/' << attrs.remove("action") - } - if(attrs["id"]) { - out << '/' << attrs.remove("id") - } - if(attrs['params']) { - def pms = attrs.remove('params') - out << '?' - def i = 0 - pms.each { k,v -> - out << "${k.encodeAsURL()}=${v?.encodeAsURL()}" - if(++i < pms.size()) - out << '&' - } - } + + def controller = attrs.containsKey("controller") ? attrs.remove("controller") : grailsAttributes.getController(request).controllerName + def action = attrs.remove("action") + def id = attrs.remove("id") + def params = attrs.params ? attrs.remove('params') : [:] + + def url + try { + if(id) params.id = id + def mapping = grailsUrlMappingsHolder?.getReverseMapping(controller,action,params) + params.controller = controller + if(action) params.action = action + url = mapping?.createURL(params) + } + finally { + params.remove('controller') + params.remove('action') + params.remove('id') + } + if(url) { + out << url + } + else { + out << '/' << controller + if(action) { + out << '/' << action + } + if(id) { + out << '/' << id + } + if(params) { + out << '?' + def i = 0 + params.each { k,v -> + out << "${k.encodeAsURL()}=${v?.encodeAsURL()}" + if(++i < params.size()) + out << '&' + } + } + } + } /** @@ -127,8 +148,8 @@ class ApplicationTagLib { } } } - out << '>' - body() + out << '>' + out << body() out << "</${attrs.name}>" } } racetrack_ch4/plugins/core/grails-app/taglib/ApplicationTagLib.groovy @@ -16,6 +16,7 @@ import org.springframework.validation.Errors; import org.springframework.context.NoSuchMessageException; import org.springframework.web.servlet.support.RequestContextUtils as RCU; import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU; +import org.codehaus.groovy.grails.commons.DomainClassArtefactHandler; /** * A tag lib that provides tags for working with form controls @@ -33,7 +34,10 @@ class FormTagLib { def textField = { attrs -> attrs.type = "text" attrs.tagName = "textField" - field(attrs) + def result = field(attrs) + if(result) { + out << result + } } /** * Creates a hidden field @@ -41,7 +45,7 @@ class FormTagLib { def hiddenField = { attrs -> attrs.type = "hidden" attrs.tagName = "hiddenField" - field(attrs) + out << field(attrs) } /** * Creates a submit button @@ -49,7 +53,7 @@ class FormTagLib { def submitButton = { attrs -> attrs.type = "submit" attrs.tagName = "submitButton" - field(attrs) + out << field(attrs) } /** * A general tag for creating fields @@ -84,7 +88,7 @@ class FormTagLib { void resolveAttributes(attrs) { if(!attrs.name && !attrs.field) { - throwTagError("Tag [$tagName] is missing required attribute [name] or [field]") + throwTagError("Tag [${attrs.tagName}] is missing required attribute [name] or [field]") } attrs.remove('tagName') @@ -121,7 +125,7 @@ class FormTagLib { def form = { attrs, body -> out << "<form action=\"" // create the link - createLink(attrs) + out << createLink(attrs) out << '\" ' // default to post @@ -133,26 +137,34 @@ class FormTagLib { out << ">" // output the body - body() + def bodyContent = body() + out << bodyContent // close tag out << "</form>" } /** * Creates a submit button that submits to an action in the controller specified by the form action - * The value of the action attribute is translated into the action name, for example "Edit" becomes - * "edit" or "List People" becomes "listPeople" + * The name of the action attribute is translated into the action name, for example "Edit" becomes + * "_action_edit" or "List People" becomes "_action_listPeople" + * If the action attribute is not specified, the value attribute will be used as part of the action name * * <g:actionSubmit value="Edit" /> + * <g:actionSubmit action="Edit" value="Some label for editing" /> * */ def actionSubmit = { attrs -> - out << '<input type="submit" name="_action" ' - def value = attrs.remove('value') - if(value) { - out << "value=\"${value}\" " + if(!attrs.value) { + throwTagError("Tag [$tagName] is missing required attribute [value]") } - // process remaining attributes + + // add action and value + def value = attrs.remove('value') + def action = attrs.action ? attrs.remove('action') : value + + out << "<input type=\"submit\" name=\"_action_${action}\" value=\"${value}\" " + + // process remaining attributes outputAttributes(attrs) // close tag @@ -161,22 +173,30 @@ class FormTagLib { } /** * Creates a an image submit button that submits to an action in the controller specified by the form action - * The value of the action attribute is translated into the action name, for example "Edit" becomes - * "edit" or "List People" becomes "listPeople" + * The name of the action attribute is translated into the action name, for example "Edit" becomes + * "_action_edit" or "List People" becomes "_action_listPeople" + * If the action attribute is not specified, the value attribute will be used as part of the action name * * <g:actionSubmitImage src="/images/submitButton.gif" action="Edit" /> * */ def actionSubmitImage = { attrs -> - out << '<input type="image" name="_action" ' - def value = attrs.remove('value') - if(value) { - out << "value=\"${value}\" " + if(!attrs.value) { + throwTagError("Tag [$tagName] is missing required attribute [value]") } + + // add action and value + def value = attrs.remove('value') + def action = attrs.action ? attrs.remove('action') : value + + out << "<input type=\"image\" name=\"_action_${action}\" value=\"${value}\" " + + // add image src def src = attrs.remove('src') if(src) { out << "src=\"${src}\" " } + // process remaining attributes outputAttributes(attrs) @@ -201,6 +221,8 @@ class FormTagLib { def value = (attrs['value'] ? attrs['value'] : xdefault) def name = attrs['name'] + def id = attrs['id'] ? attrs['id'] : name + def noSelection = attrs['noSelection'] if (noSelection != null) { @@ -253,7 +275,7 @@ class FormTagLib { // create day select if (precision >= PRECISION_RANKINGS["day"]) { - out.println "<select name=\"${name}_day\">" + out.println "<select name=\"${name}_day\" id=\"${id}_day\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -272,7 +294,7 @@ class FormTagLib { // create month select if (precision >= PRECISION_RANKINGS["month"]) { - out.println "<select name=\"${name}_month\">" + out.println "<select name=\"${name}_month\" id=\"${id}_month\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -294,7 +316,7 @@ class FormTagLib { // create year select if (precision >= PRECISION_RANKINGS["year"]) { - out.println "<select name=\"${name}_year\">" + out.println "<select name=\"${name}_year\" id=\"${id}_year\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -313,7 +335,7 @@ class FormTagLib { // do hour select if (precision >= PRECISION_RANKINGS["hour"]) { - out.println "<select name=\"${name}_hour\">" + out.println "<select name=\"${name}_hour\" id=\"${id}_hour\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -338,7 +360,7 @@ class FormTagLib { // do minute select if (precision >= PRECISION_RANKINGS["minute"]) { - out.println "<select name=\"${name}_minute\">" + out.println "<select name=\"${name}_minute\" id=\"${id}_minute\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -360,7 +382,7 @@ class FormTagLib { def renderNoSelectionOption = { noSelectionKey, noSelectionValue, value -> // If a label for the '--Please choose--' first item is supplied, write it out out << '<option value="' << (noSelectionKey == null ? "" : noSelectionKey) << '"' - if(noSelectionKey == value) { + if(noSelectionKey.equals(value)) { out << ' selected="selected" ' } out << '>' << noSelectionValue.encodeAsHTML() << '</option>' @@ -388,7 +410,7 @@ class FormTagLib { } // use generic select - select( attrs ) + out << select( attrs ) } /** @@ -405,7 +427,7 @@ class FormTagLib { attrs['optionValue'] = { "${it.language}, ${it.country}, ${it.displayName}" } // use generic select - select( attrs ) + out << select( attrs ) } /** @@ -425,7 +447,7 @@ class FormTagLib { attrs.value = null } // invoke generic select - select( attrs ) + out << select( attrs ) } /** @@ -436,11 +458,15 @@ class FormTagLib { * <g:select name="user.company.id" from="${Company.list()}" value="${user?.company.id}" optionKey="id" /> */ def select = { attrs -> + def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource") + def locale = RCU.getLocale(request) + def from = attrs.remove('from') def keys = attrs.remove('keys') def optionKey = attrs.remove('optionKey') def optionValue = attrs.remove('optionValue') def value = attrs.remove('value') + def valueMessagePrefix = attrs.remove('valueMessagePrefix') def noSelection = attrs.remove('noSelection') if (noSelection != null) { noSelection = noSelection.entrySet().iterator().next() @@ -461,20 +487,21 @@ class FormTagLib { // create options from list if(from) { from.eachWithIndex { el,i -> + def keyValue = null out << '<option ' if(keys) { - out << 'value="' << keys[i] << '" ' - if(keys[i] == value) { + keyValue = keys[i] + out << 'value="' << keyValue << '" ' + if(keyValue == value) { out << 'selected="selected" ' } } - else if(optionKey) { - def keyValue = null + else if(optionKey) { if(optionKey instanceof Closure) { keyValue = optionKey(el) - out << 'value="' << keyValue << '" ' + out << 'value="' << keyValue << '" ' } - else if(el !=null && optionKey == 'id' && grailsApplication.getGrailsDomainClass(el.getClass().name)) { + else if(el !=null && optionKey == 'id' && grailsApplication.getArtefact(DomainClassArtefactHandler.TYPE, el.getClass().name)) { keyValue = el.ident() out << 'value="' << keyValue << '" ' } @@ -488,8 +515,9 @@ class FormTagLib { } } else { - out << "value=\"${el}\" " - if(el == value) { + keyValue = el + out << "value=\"${keyValue}\" " + if(keyValue == value) { out << 'selected="selected" ' } } @@ -502,6 +530,19 @@ class FormTagLib { out << el.properties[optionValue].toString().encodeAsHTML() } } + else if(valueMessagePrefix) { + def message = messageSource.getMessage("${valueMessagePrefix}.${keyValue}", null, null, locale) + if(message) { + out << message.encodeAsHTML() + } + else if (keyValue) { + out << keyValue.encodeAsHTML() + } + else { + def s = el.toString() + if(s) out << s.encodeAsHTML() + } + } else { def s = el.toString() if(s) out << s.encodeAsHTML() @@ -554,6 +595,6 @@ class FormTagLib { outputAttributes(attrs) // close the tag, with no body - out << ' ></input>' + out << ' />' } } \ No newline at end of file racetrack_ch4/plugins/core/grails-app/taglib/FormTagLib.groovy @@ -95,7 +95,7 @@ class JavascriptTagLib { } else { out.println '<script type="text/javascript">' - body() + out << body() out.println '</script>' } } @@ -137,15 +137,15 @@ class JavascriptTagLib { /** * A link to a remote uri that used the prototype library to invoke the link via ajax */ - def remoteLink = { attrs, body -> + def remoteLink = { attrs, body -> out << "<a href=\"" def cloned = deepClone(attrs) - createLink(cloned) + out << createLink(cloned) out << "\" onclick=\"" // create remote function - remoteFunction(attrs) + out << remoteFunction(attrs) attrs.remove('url') out << "return false;\" " // process remaining attributes @@ -154,7 +154,7 @@ class JavascriptTagLib { } out << ">" // output the body - body() + out << body() // close tag out << "</a>" @@ -180,7 +180,7 @@ class JavascriptTagLib { else { attrs.params = "'${paramName}='+this.value" } - remoteFunction(attrs) + out << remoteFunction(attrs) attrs.remove('params') out << "\"" attrs.remove('url') @@ -208,16 +208,16 @@ class JavascriptTagLib { // prepare form settings prepareAjaxForm(p,attrs) - def params = [ onsubmit:TagLibUtil.outToString(remoteFunction,attrs) + 'return false', + def params = [ onsubmit:remoteFunction(attrs) + 'return false', method: (attrs.method? attrs.method : 'POST' ), - action: (attrs.action? attrs.action : TagLibUtil.outToString(createLink,url)) + action: (attrs.action? attrs.action : createLink(url)) ] attrs.remove('url') params.putAll(attrs) if(params.name && !params.id) params.id = params.name - withTag(name:'form',attrs:params) { - body() + out << withTag(name:'form',attrs:params) { + out << body() } } @@ -230,7 +230,7 @@ class JavascriptTagLib { // prepare form settings attrs.forSubmitTag = ".form" prepareAjaxForm(p,attrs) - def params = [ onclick:TagLibUtil.outToString(remoteFunction,attrs) + 'return false', + def params = [ onclick:remoteFunction(attrs) + 'return false', type: 'button', name: attrs.remove('name'), value: attrs.remove('value'), @@ -238,8 +238,8 @@ class JavascriptTagLib { 'class':attrs.remove('class') ] - withTag(name:'input', attrs:params) { - body() + out << withTag(name:'input', attrs:params) { + out << body() } } @@ -275,7 +275,7 @@ class JavascriptTagLib { def sw = new StringWriter() out = new PrintWriter(out) // invoke body - body() + out << body() // restore out out = tmp js = sw.toString() @@ -357,10 +357,10 @@ class PrototypeProvider implements JavascriptProvider { def pms = attrs.remove('params') if(attrs.url) { - taglib.createLink(attrs.url) + out << taglib.createLink(attrs.url) } else { - taglib.createLink(attrs) + out << taglib.createLink(attrs) } @@ -415,6 +415,7 @@ class PrototypeProvider implements JavascriptProvider { case 'true': ajaxOptions << "${k}:${v}"; break; case 'false': ajaxOptions << "${k}:${v}"; break; case ~/\s*function(\w*)\s*/: ajaxOptions << "${k}:${v}"; break; + case ~/Insertion\..*/: ajaxOptions << "${k}:${v}"; break; default:ajaxOptions << "${k}:'${v}'"; break; } } @@ -441,10 +442,10 @@ class YahooProvider implements JavascriptProvider { out << "YAHOO.util.Connect.asyncRequest('${method}','" if(attrs.url) { - taglib.createLink(attrs.url) + out << taglib.createLink(attrs.url) } else { - taglib.createLink(attrs) + out << taglib.createLink(attrs) } attrs.remove('url') out << "'," @@ -504,7 +505,7 @@ class DojoProvider implements JavascriptProvider { } out << 'dojo.io.bind({url:\'' - taglib.createLink(attrs) + out << taglib.createLink(attrs) attrs.remove('params') out << '\',load:function(type,data,evt) {' if(attrs.onLoaded) { racetrack_ch4/plugins/core/grails-app/taglib/JavascriptTagLib.groovy @@ -25,6 +25,7 @@ import org.springframework.web.servlet.support.RequestContextUtils as RCU; import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU; class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants { + def out // to facilitate testing protected getPage() { return request[PAGE] @@ -91,7 +92,7 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants } } if(invokeBody) { - body(); + out << body() } } } @@ -134,54 +135,183 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants if(attrs.total == null) throwTagError("Tag [paginate] is missing required attribute [total]") - def mkp = new groovy.xml.MarkupBuilder(out) + def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource") + def locale = RCU.getLocale(request) + def total = attrs.total.toInteger() - def max = params.max?.toInteger() - def offset = params.offset?.toInteger() def action = (attrs.action? attrs.action : 'list') - def breadcrumb = true - if(attrs.breadcrumb) breadcrumb = Boolean.valueOf(attrs.breadcrumb) - + def offset = params.offset?.toInteger() + def max = params.max?.toInteger() + def maxsteps = (attrs.maxsteps ? attrs.maxsteps.toInteger() : 10) + + if(attrs.breadcrumb) { + log.warn("Tag [paginate] includes the [breadcrumb] attribute. This attribute is deprecated and will be removed in the future. Please update your code to use the [maxsteps] attribute instead.") + } + + if(!offset) offset = (attrs.offset ? attrs.offset.toInteger() : 0) if(!max) max = (attrs.max ? attrs.max.toInteger() : 10) - if(!offset) offset = (attrs.offset ? attrs.offset.toInteger() : 0) - def linkParams = [offset:offset-max,max:max] - def linkTagAttrs = ['class':'prevLink',action:action] + def linkParams = [offset:offset - max, max:max] + if(params.sort) linkParams.sort = params.sort + if(params.order) linkParams.order = params.order + if(attrs.params) linkParams.putAll(attrs.params) + + def linkTagAttrs = [action:action] if(attrs.controller) { linkTagAttrs.controller = attrs.controller } if(attrs.id) { linkTagAttrs.id = attrs.id } - if(attrs.params)linkParams.putAll(attrs.params) linkTagAttrs.params = linkParams - - def combined = max + offset - if(offset > 0) { - link(linkTagAttrs.clone(),{out<< (attrs.prev? attrs.prev : 'Previous' ) }) + + // determine paging variables + def steps = maxsteps > 0 + int currentstep = (offset / max) + 1 + int firststep = 1 + int laststep = Math.round(Math.ceil(total / max)) + + // display previous link when not on firststep + if(currentstep > firststep) { + linkTagAttrs.class = 'prevLink' + out << link(linkTagAttrs.clone()) { + (attrs.prev ? attrs.prev : messageSource.getMessage('default.paginate.prev', null, 'Previous', locale)) + } } - if(total > max) { - linkTagAttrs.'class' = 'step' - if(breadcrumb) { - def j = 0 - 0.step(total,max) { i -> - if(offset == i) { - mkp.a('class':'step',"${++j}") - } - else { - linkParams.offset=i - link(linkTagAttrs.clone(),{out<<++j}) - } - } + // display steps when steps are enabled and laststep is not firststep + if(steps && laststep > firststep) { + linkTagAttrs.class = 'step' + + // determine begin and endstep paging variables + int beginstep = currentstep - Math.round(maxsteps / 2) + (maxsteps % 2) + int endstep = currentstep + Math.round(maxsteps / 2) - 1 + + if(beginstep < firststep) { + beginstep = firststep + endstep = maxsteps + } + if(endstep > laststep) { + beginstep = laststep - maxsteps + 1 + if(beginstep < firststep) { + beginstep = firststep + } + endstep = laststep + } + + // display firststep link when beginstep is not firststep + if(beginstep > firststep) { + linkParams.offset = 0 + out << link(linkTagAttrs.clone()) {firststep.toString()} + out << '<span class="step">..</span>' + } + + // display paginate steps + (beginstep..endstep).each { i -> + if(currentstep == i) { + out << "<span class=\"currentStep\">${i}</span>" + } + else { + linkParams.offset = (i - 1) * max + out << link(linkTagAttrs.clone()) {i.toString()} + } + } + + // display laststep link when endstep is not laststep + if(endstep < laststep) { + out << '<span class="step">..</span>' + linkParams.offset = (laststep -1) * max + out << link(linkTagAttrs.clone()) { laststep.toString() } + } + } + + // display next link when not on laststep + if(currentstep < laststep) { + linkTagAttrs.class = 'nextLink' + linkParams.offset = offset + max + out << link(linkTagAttrs.clone()) { + (attrs.next ? attrs.next : messageSource.getMessage('default.paginate.next', null, 'Next', locale)) } } - linkParams.offset = offset+max - if(combined < total) { - linkTagAttrs.'class'='nextLink' - link(linkTagAttrs,{out<< (attrs.'next'? attrs.'next' : 'Next' )}) + + } + + /** + * Renders a sortable column to support sorting in list views + * + * Attributes: + * + * property - name of the property relating to the field + * defaultOrder (optional) - default order for the property; choose between asc (default if not provided) and desc + * title (optional*) - title caption for the column + * titleKey (optional*) - title key to use for the column, resolved against the message source + * params (optional) - a map containing request parameters + * + * Attribute title or titleKey is required. When both attributes are specified then titleKey takes precedence, + * resulting in the title caption to be resolved against the message source. In case when the message could + * not be resolved, the title will be used as title caption. + * + * Examples: + * + * <g:sortableColumn property="title" title="Title" /> + * <g:sortableColumn property="title" title="Title" style="width: 200px" /> + * <g:sortableColumn property="title" titleKey="book.title" /> + * <g:sortableColumn property="releaseDate" defaultOrder="desc" title="Release Date" /> + * <g:sortableColumn property="releaseDate" defaultOrder="desc" title="Release Date" titleKey="book.releaseDate" /> + */ + def sortableColumn = { attrs -> + + if(!attrs.property) + throwTagError("Tag [sortableColumn] is missing required attribute [property]") + + if(!attrs.title && !attrs.titleKey) + throwTagError("Tag [sortableColumn] is missing required attribute [title] or [titleKey]") + + def property = attrs.remove("property") + def action = attrs.action ? attrs.remove("action") : "list" + + def defaultOrder = attrs.remove("defaultOrder") + if(defaultOrder != "desc") defaultOrder = "asc" + + // current sorting property and order + def sort = params.sort + def order = params.order + + // add sorting property and params to link params + def linkParams = [sort:property] + if(attrs.params) linkParams.putAll(attrs.params) + + // determine and add sorting order for this column to link params + attrs.class = "sortable" + if(property == sort) { + attrs.class = attrs.class + " sorted " + order + if(order == "asc") { + linkParams.order = "desc" + } + else { + linkParams.order = "asc" + } + } + else { + linkParams.order = defaultOrder + } + + // determine column title + def title = attrs.remove("title") + def titleKey = attrs.remove("titleKey") + if(titleKey) { + if(!title) title = titleKey + def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource") + def locale = RCU.getLocale(request) + title = messageSource.getMessage(titleKey, null, title, locale) } + out << "<th " + // process remaining attributes + attrs.each { k, v -> + out << "${k}=\"${v.encodeAsHTML()}\" " + } + out << ">${link(action:action, params:linkParams) { title }}</th>" } /** @@ -199,14 +329,7 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants def uri = grailsAttributes.getTemplateUri(attrs.template,request) def var = attrs['var'] - def url = servletContext.getResource(uri) - if(!url) - throwTagError("No template found for name [${attrs.template}] in tag [render]") - - def t = engine.createTemplate( uri, - servletContext, - request, - response) + def t = engine.createTemplate( uri ) if(attrs.model instanceof Map) { t.make( attrs.model ).writeTo(out) @@ -246,14 +369,7 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants def engine = grailsAttributes.getPagesTemplateEngine() def uri = grailsAttributes.getTemplateUri(attrs.template,request) - def url = servletContext.getResource(uri) - if(!url) - throwTagError("No template found for name [${attrs.template}] in tag [include]") - - def t = engine.createTemplate( uri, - servletContext, - request, - response) + def t = engine.createTemplate( uri ) t.make().writeTo(out) } racetrack_ch4/plugins/core/grails-app/taglib/RenderTagLib.groovy @@ -152,7 +152,7 @@ class UITagLib { * <g:richTextEditor name="editor" height="400" /> */ def richTextEditor = { attrs -> - withTag(name:'script',attributes:[type:'text/javascript']) { + out << withTag(name:'script',attributes:[type:'text/javascript']) { if(attrs.onComplete) { out.println "function FCKeditor_OnComplete( editorInstance ) {" out.println "${attrs.onComplete}(editorInstance);" @@ -162,24 +162,53 @@ class UITagLib { var oFCKeditor = new FCKeditor( '${attrs.name}' ) ; oFCKeditor.BasePath = \"""" if(attrs.basepath) { - createLinkTo(dir:attrs.basepath) + out << createLinkTo(dir:attrs.basepath) } else { - createLinkTo(dir:"fckeditor/") + out << createLinkTo(dir:"fckeditor/") } out.println '";' if(attrs.toolbar) { out << "oFCKeditor.ToolbarSet = '${attrs.toolbar}';" - } + } + // add width support + if(attrs.width) + out.println "oFCKeditor.Width = '${attrs.width}';" + if(attrs.height) - out.println "oFCKeditor.Height = ${attrs.height};" + out.println "oFCKeditor.Height = '${attrs.height}';" + + // add skin support, values to choose: "default", "office2003", "silver" + if(attrs.skin) + out.println "oFCKeditor.Config['SkinPath'] = 'skins/${attrs.skin}/';" + + // check the browser compatibility when rendering the editor. default value: true, values to choose: true, false, + if(attrs.checkBrowser) + out.println "oFCKeditor.CheckBrowser = ${attrs.checkBrowser};" + + // show error messages on errors while rendering the editor. default value: true, values to choose: true, false + if(attrs.displayErrors) + out.println "oFCKeditor.DisplayErrors = ${attrs.displayErrors};" + + // oFCKeditor.Config AutoDetectLanguage:true/false, DefaultLanguage:'pt-BR' and so on + if(attrs.config) { + if (attrs.config instanceof Map) { + attrs.config.each { k, v -> + out.println "oFCKeditor.Config['$k'] = '$v';" + } + } else { + throw new Exception("""The format of config is not correct, it should be like "[AutoDetectLanguage:false, DefaultLanguage:'pt-BR']" """) + } + } + if(attrs.value) { out << "oFCKeditor.Value = \"" - escapeJavascript(Collections.EMPTY_MAP,attrs.value) + out << escapeJavascript(Collections.EMPTY_MAP,attrs.value) out.println "\" ;" } - out.println "oFCKeditor.Create();" + out.println "oFCKeditor.Create();" + } } } \ No newline at end of file racetrack_ch4/plugins/core/grails-app/taglib/UITagLib.groovy @@ -32,9 +32,7 @@ class ValidationTagLib { def model = attrs['model'] def checkList = [] if(model) { - checkList = model.findAll { k,v -> - return ((v.errors != null) && (v.errors instanceof Errors)) - } + checkList = model.findAll { it.value?.errors instanceof Errors }.collect { it.value } } if(attrs['bean']) { checkList << attrs['bean'] @@ -45,7 +43,7 @@ class ValidationTagLib { if(ra) { if(ra instanceof Errors) checkList << ra - else if ((ra.properties.errors) && (ra.errors instanceof Errors)) { + else if (ra.properties?.errors instanceof Errors) { checkList << ra } } @@ -55,23 +53,29 @@ class ValidationTagLib { for(i in checkList) { def errors = null - if(i instanceof Errors) { + if (i instanceof Errors) { errors = i } - else { - if ((i.errors != null) && (i.errors instanceof Errors)) { - if (i.hasErrors()) - errors = i.errors - } + else { + try { + if ((i.errors != null) && (i.errors instanceof Errors)) { + if (i.hasErrors()) + errors = i.errors + } + + } + catch(MissingPropertyException mpe) { + // ignore + } } if(errors) { if(attrs['field']) { if(errors.hasFieldErrors(attrs['field'])) { - body() + out << body() } } else { - body() + out << body() } } } @@ -84,9 +88,7 @@ class ValidationTagLib { def model = attrs['model'] def errorList = [] if(model) { - errorList = model.findAll { k,v -> - return ((v.errors != null) && (v.errors instanceof Errors)) - } + errorList = model.findAll { it.value?.errors instanceof Errors }.collect { it.value } } if(attrs['bean']) { errorList << attrs['bean'] @@ -95,9 +97,9 @@ class ValidationTagLib { request.attributeNames.each { def ra = request[it] if(ra) { - if(ra instanceof Errors) + if (ra instanceof Errors) errorList << ra - else if ((ra.errors != null) && (ra.errors instanceof Errors)) { + else if (ra.properties?.errors instanceof Errors) { errorList << ra } } @@ -119,13 +121,13 @@ class ValidationTagLib { if(attrs['field']) { if(errors.hasFieldErrors(attrs['field'])) { errors.getFieldErrors( attrs["field"] ).each { - body(it) + out << body(it) } } } else { errors.allErrors.each { - body( it ) + out << body( it ) } } } @@ -141,9 +143,9 @@ class ValidationTagLib { if(renderAs == 'list') { out << "<ul>" - eachError(attrs, { + out << eachError(attrs, { out << "<li>" - message(error:it) + out << message(error:it) out << "</li>" } ) @@ -219,7 +221,7 @@ class ValidationTagLib { } def app = grailsAttributes.getGrailsApplication() - def dc = app.getGrailsDomainClass(againstClass) + def dc = app.getDomainClass(againstClass) if(!dc) throwTagError("Tag [validate] could not find a domain class to validate against for name [${againstClass}]") racetrack_ch4/plugins/core/grails-app/taglib/ValidationTagLib.groovy @@ -8,7 +8,7 @@ class URLCodec { } static decode = { obj -> - URLEncoder.decode(obj.toString(), URLCodec.getEncoding()) + URLDecoder.decode(obj.toString(), URLCodec.getEncoding()) } private static def getEncoding() { racetrack_ch4/plugins/core/grails-app/utils/URLCodec.groovy @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> - -<beans> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> </beans> \ No newline at end of file racetrack_ch4/spring/resources.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> -<beans> <bean id="grailsApplication" class="org.codehaus.groovy.grails.commons.GrailsApplicationFactoryBean"> <description>Grails application factory bean</description> <property name="groovyFiles"> @@ -25,7 +27,7 @@ <property name="pluginManager" ref="pluginManager" /> </bean> - <bean id="grailsResourceHolder" singleton="false" class="org.codehaus.groovy.grails.commons.spring.GrailsResourceHolder"> + <bean id="grailsResourceHolder" scope="prototype" class="org.codehaus.groovy.grails.commons.spring.GrailsResourceHolder"> <property name="resources"> <value>classpath*:**/grails-app/**/*.groovy</value> </property> racetrack_ch4/web-app/WEB-INF/applicationContext.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> - -<beans> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> </beans> \ No newline at end of file racetrack_ch4/web-app/WEB-INF/spring/resources.xml @@ -10,6 +10,254 @@ <uri>http://grails.codehaus.org/tags</uri> <tag> + <description> + Enables the storing of a value into the given ${var} + </description> + <name>set</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovySetTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The value to store</description> + <name>value</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The name of the variable to store the value in</description> + <name>var</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Enables the storing of a value into the given ${var} into the page context + </description> + <name>def</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyDefTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The value to store</description> + <name>value</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The name of the variable to store the value in</description> + <name>var</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Logical if tag to test whether the given condition is true + </description> + <name>if</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyIfTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The condition to test</description> + <name>test</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Logical else tag as fallback if the if condition fails + </description> + <name>else</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyElseTag</tag-class> + <body-content>JSP</body-content> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Logical elseif tag to test whether the given condition is true + </description> + <name>elseif</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyElseIfTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The condition to test</description> + <name>test</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Tag to loop over a collection while the test expression returns true + </description> + <name>while</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyWhileTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The condition to test</description> + <name>test</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection</description> + <name>each</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyEachTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>true</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection</description> + <name>findAll</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyFindAllTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The expression to filter the elements to iterate over</description> + <name>expr</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>true</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection and collects the elements + you want to work with</description> + <name>collect</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyCollectTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The expression to use to collect the elements. The + expression must retur true to add the element to the + collection</description> + <name>expr</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection and filters the elements + with a regular expression</description> + <name>grep</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyGrepTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The regular expression to filter the element with. The + filter is a simple Groovy Regex</description> + <name>filter</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description>A tag that attempts to render an input for a bean property + into an appropriate component based on the type. It uses the templates + defined in "grails-app/views/scaffolding" to achieve this by looking up + the template by type.</description> + <name>renderInput</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyRenderInputTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The Bean to render the input for</description> + <name>bean</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The property of the bean to render input for</description> + <name>property</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> <name>link</name> <tag-class>org.codehaus.groovy.grails.web.taglib.jsp.JspLinkTag</tag-class> <body-content>JSP</body-content> racetrack_ch4/web-app/WEB-INF/tld/grails.tld @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" racetrack_ch4/web-app/WEB-INF/web.template.xml @@ -1,4 +1,4 @@ -<web-app xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd' version='2.4' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://java.sun.com/xml/ns/j2ee'><context-param><param-name>log4jConfigLocation</param-name><param-value>/WEB-INF/classes/log4j.properties</param-value></context-param><context-param><param-name>contextConfigLocation</param-name><param-value>/WEB-INF/applicationContext.xml</param-value></context-param><context-param><param-name>webAppRootKey</param-name><param-value>racetrack</param-value></context-param><filter><filter-name>sitemesh</filter-name><filter-class>org.codehaus.groovy.grails.web.sitemesh.GrailsPageFilter</filter-class></filter><filter><filter-name>charEncodingFilter</filter-name><filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class><init-param><param-name>targetBeanName</param-name><param-value>characterEncodingFilter</param-value></init-param><init-param><param-name>targetFilterLifecycle</param-name><param-value>true</param-value></init-param></filter><filter><filter-name>grailsWebRequest</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequestFilter</filter-class></filter><filter><filter-name>reloadFilter</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.filter.GrailsReloadServletFilter</filter-class></filter><filter-mapping><filter-name>charEncodingFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>grailsWebRequest</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>sitemesh</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>reloadFilter</filter-name><url-pattern>/registration/*</url-pattern></filter-mapping><filter-mapping><filter-name>reloadFilter</filter-name><url-pattern>/race/*</url-pattern></filter-mapping><listener><listener-class>org.springframework.web.util.Log4jConfigListener</listener-class></listener><listener><listener-class>org.codehaus.groovy.grails.web.context.GrailsContextLoaderListener</listener-class></listener><servlet><servlet-name>grails</servlet-name><servlet-class>org.codehaus.groovy.grails.web.servlet.GrailsDispatcherServlet</servlet-class><load-on-startup>1</load-on-startup></servlet><servlet><servlet-name>gsp</servlet-name><servlet-class>org.codehaus.groovy.grails.web.pages.GroovyPagesServlet</servlet-class><init-param><description> +<web-app xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd' version='2.4' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://java.sun.com/xml/ns/j2ee'><context-param><param-name>log4jConfigLocation</param-name><param-value>/WEB-INF/classes/log4j.properties</param-value></context-param><context-param><param-name>log4jRefreshInterval</param-name><param-value>1000</param-value></context-param><context-param><param-name>contextConfigLocation</param-name><param-value>/WEB-INF/applicationContext.xml</param-value></context-param><context-param><param-name>webAppRootKey</param-name><param-value>racetrack</param-value></context-param><filter><filter-name>sitemesh</filter-name><filter-class>org.codehaus.groovy.grails.web.sitemesh.GrailsPageFilter</filter-class></filter><filter><filter-name>charEncodingFilter</filter-name><filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class><init-param><param-name>targetBeanName</param-name><param-value>characterEncodingFilter</param-value></init-param><init-param><param-name>targetFilterLifecycle</param-name><param-value>true</param-value></init-param></filter><filter><filter-name>grailsWebRequest</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequestFilter</filter-class></filter><filter><filter-name>urlMapping</filter-name><filter-class>org.codehaus.groovy.grails.web.mapping.filter.UrlMappingsFilter</filter-class></filter><filter><filter-name>reloadFilter</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.filter.GrailsReloadServletFilter</filter-class></filter><filter-mapping><filter-name>charEncodingFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>grailsWebRequest</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>reloadFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>sitemesh</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>urlMapping</filter-name><url-pattern>/*</url-pattern></filter-mapping><listener><listener-class>org.springframework.web.util.Log4jConfigListener</listener-class></listener><listener><listener-class>org.codehaus.groovy.grails.web.context.GrailsContextLoaderListener</listener-class></listener><servlet><servlet-name>grails</servlet-name><servlet-class>org.codehaus.groovy.grails.web.servlet.GrailsDispatcherServlet</servlet-class><load-on-startup>1</load-on-startup></servlet><servlet><servlet-name>gsp</servlet-name><servlet-class>org.codehaus.groovy.grails.web.pages.GroovyPagesServlet</servlet-class><init-param><description> Allows developers to view the intermediade source code, when they pass - a spillGroovy argument in the URL. - </description><param-name>showSource</param-name><param-value>1</param-value></init-param></servlet><servlet-mapping><servlet-name>gsp</servlet-name><url-pattern>*.gsp</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>/registration/*</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>/race/*</url-pattern></servlet-mapping><welcome-file-list><welcome-file>index.jsp</welcome-file><welcome-file>index.gsp</welcome-file></welcome-file-list><jsp-config><taglib><taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri><taglib-location>/WEB-INF/tld/c.tld</taglib-location></taglib><taglib><taglib-uri>http://java.sun.com/jsp/jstl/fmt</taglib-uri><taglib-location>/WEB-INF/tld/fmt.tld</taglib-location></taglib><taglib><taglib-uri>http://www.springframework.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/spring.tld</taglib-location></taglib><taglib><taglib-uri>http://grails.codehaus.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/grails.tld</taglib-location></taglib></jsp-config></web-app> \ No newline at end of file + a spillGroovy argument in the URL. + </description><param-name>showSource</param-name><param-value>1</param-value></init-param></servlet><servlet-mapping><servlet-name>gsp</servlet-name><url-pattern>*.gsp</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>*.dispatch</url-pattern></servlet-mapping><welcome-file-list><welcome-file>index.jsp</welcome-file><welcome-file>index.gsp</welcome-file></welcome-file-list><jsp-config><taglib><taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri><taglib-location>/WEB-INF/tld/c.tld</taglib-location></taglib><taglib><taglib-uri>http://java.sun.com/jsp/jstl/fmt</taglib-uri><taglib-location>/WEB-INF/tld/fmt.tld</taglib-location></taglib><taglib><taglib-uri>http://www.springframework.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/spring.tld</taglib-location></taglib><taglib><taglib-uri>http://grails.codehaus.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/grails.tld</taglib-location></taglib></jsp-config></web-app> \ No newline at end of file racetrack_ch4/web-app/WEB-INF/web.xml @@ -124,4 +124,15 @@ td .errors { .prop .value { text-align:left; width:80%; +} + +.prevLink, .step, .currentStep, .nextLink { + padding-right: 5px; +} +.currentStep { + font-weight:bold; +} + +th.sorted a, th.sorted a:link, th.sorted a:visited, th.sorted a:hover, th.sortable a, th.sortable a:link, th.sortable a:visited, th.sortable a:hover { + color: white; } \ No newline at end of file racetrack_ch4/web-app/css/main.css @@ -1,7 +1,7 @@ function warnBeforeRaceDelete() { return confirm('Are you sure you want to delete this race?') -} +} function warnBeforeRegistrationDelete() { return confirm('Are you sure you want to delete this registration?') -} \ No newline at end of file +} racetrack_ch4/web-app/js/racetrack.js @@ -10,7 +10,9 @@ <classpathentry kind="src" path="grails-tests"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="var" path="GRAILS_HOME/ant/lib/ant.jar"/> - <classpathentry kind="var" path="GRAILS_HOME/lib/ant-nodeps.jar" /> + <classpathentry kind="var" path="GRAILS_HOME/lib/ant-junit.jar" /> + +<classpathentry kind="var" path="GRAILS_HOME/lib/ant-nodeps.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/ant.jar" /> @@ -48,9 +50,9 @@ <classpathentry kind="var" path="GRAILS_HOME/lib/ejb3-persistence.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/gant-0.2.2-SNAPSHOT.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/gant-0.2.5-SNAPSHOT.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/groovy-all-1.0.1-SNAPSHOT.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/groovy-all-1.1-BETA-1.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/groovy-starter.jar" /> @@ -80,13 +82,13 @@ <classpathentry kind="var" path="GRAILS_HOME/lib/log4j-1.2.8.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/ognl-2.7.jar" /> - <classpathentry kind="var" path="GRAILS_HOME/lib/org.mortbay.jetty.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/oro-2.0.8.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/quartz-1.5.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/quartz-1.6.0.jar" /> + +<classpathentry kind="var" path="GRAILS_HOME/lib/serializer.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/servletapi-2.4.jar" /> @@ -106,18 +108,20 @@ <classpathentry kind="var" path="GRAILS_HOME/lib/standard-2.4.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/xalan.jar" /> + <classpathentry kind="var" path="GRAILS_HOME/lib/xerces-2.6.2.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/xml-apis.jar" /> - <classpathentry kind="var" path="GRAILS_HOME/dist/grails-core-0.4.2.jar" /> + <classpathentry kind="var" path="GRAILS_HOME/dist/grails-core-0.5.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/dist/grails-crud-0.4.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/dist/grails-crud-0.5.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/dist/grails-gorm-0.4.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/dist/grails-gorm-0.5.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/dist/grails-web-0.4.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/dist/grails-web-0.5.jar" /> <classpathentry kind="output" path="web-app/WEB-INF/classes"/> racetrack_ch5/.classpath @@ -1,4 +1,4 @@ -#Do not edit app.grails.* properties, they may change automatically. DO NOT put application configuration in here, it is not the right place! -#Sun Mar 11 15:49:46 EDT 2007 -app.grails.version=0.4.2 +#Wed May 02 20:22:50 EDT 2007 +app.version=0.1 +app.grails.version=0.5 app.name=racetrack racetrack_ch5/application.properties @@ -1,8 +1,8 @@ -class DevelopmentDataSource { +class DevelopmentDataSource { boolean pooling = true String dbCreate = "update" String url = "jdbc:mysql://localhost/racetrack_dev" String driverClassName = "com.mysql.jdbc.Driver" String username = "jason" String password = "" -} +} racetrack_ch5/grails-app/conf/DevelopmentDataSource.groovy @@ -4,7 +4,28 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.rootLogger=error, stdout -# Enable this logger to log Hibernate output +# This logger is for your own application artefact logs +# Artefacts are logged by their type and optionally class name i.e: +# +# log4j.logger.grails.app.controller.HelloController=debug, stdout +# ...will control the logs from just that controller +# +# log4j.logger.grails.app.domain=trace, stdout +# ...will control the logs for all domain classes +# +# At the time of writing, supported artefact type ids include: +# domain (aka Domain Class), task (aka Job), service, dataSource, +# controller, tagLib, urlMappings, codec, bootstrap +# +# The default "info" level for all artefacts is set here +log4j.logger.grails.app=info,stdout +log4j.additivity.grails.app=false + +## This logger is for Grails' public APIs within the grails. package +log4j.logger.grails=info,stdout +log4j.additivity.grails=false + +## Enable this logger to log Hibernate output # handy to see its database interaction activity #log4j.logger.org.hibernate=debug,stdout #log4j.additivity.org.hibernate=false @@ -37,7 +58,3 @@ log4j.logger.org.codehaus.groovy.grails.plugins=info,stdout log4j.additivity.org.codehaus.groovy.grails.plugins=false log4j.logger.grails.spring=info,stdout log4j.additivity.grails.spring=false - -# This logger is for Grails' public APIs within the grails. package -log4j.logger.grails=info,stdout -log4j.additivity.grails=false racetrack_ch5/grails-app/conf/log4j.development.properties @@ -4,7 +4,28 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.rootLogger=error, stdout -# Enable this logger to log Hibernate output +# This logger is for your own application artefact logs +# Artefacts are logged by their type and optionally class name i.e: +# +# log4j.logger.grails.app.controller.HelloController=debug, stdout +# ...will control the logs from just that controller +# +# log4j.logger.grails.app.domain=trace, stdout +# ...will control the logs for all domain classes +# +# At the time of writing, supported artefact type ids include: +# domain (aka Domain Class), task (aka Job), service, dataSource, +# controller, tagLib, urlMappings, codec, bootstrap +# +# The default "info" level for all artefacts is set here +log4j.logger.grails.app=info,stdout +log4j.additivity.grails.app=false + +## This logger is for Grails' public APIs within the grails. package +log4j.logger.grails=info,stdout +log4j.additivity.grails=false + +## Enable this logger to log Hibernate output # handy to see its database interaction activity #log4j.logger.org.hibernate=debug,stdout #log4j.additivity.org.hibernate=false @@ -37,7 +58,3 @@ log4j.logger.org.codehaus.groovy.grails.plugins=info,stdout log4j.additivity.org.codehaus.groovy.grails.plugins=false log4j.logger.grails.spring=info,stdout log4j.additivity.grails.spring=false - -# This logger is for Grails' public APIs within the grails. package -log4j.logger.grails=info,stdout -log4j.additivity.grails=false racetrack_ch5/grails-app/conf/log4j.production.properties @@ -4,7 +4,28 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.rootLogger=error, stdout -# Enable this logger to log Hibernate output +# This logger is for your own application artefact logs +# Artefacts are logged by their type and optionally class name i.e: +# +# log4j.logger.grails.app.controller.HelloController=debug, stdout +# ...will control the logs from just that controller +# +# log4j.logger.grails.app.domain=trace, stdout +# ...will control the logs for all domain classes +# +# At the time of writing, supported artefact type ids include: +# domain (aka Domain Class), task (aka Job), service, dataSource, +# controller, tagLib, urlMappings, codec, bootstrap +# +# The default "info" level for all artefacts is set here +log4j.logger.grails.app=info,stdout +log4j.additivity.grails.app=false + +## This logger is for Grails' public APIs within the grails. package +log4j.logger.grails=info,stdout +log4j.additivity.grails=false + +## Enable this logger to log Hibernate output # handy to see its database interaction activity #log4j.logger.org.hibernate=debug,stdout #log4j.additivity.org.hibernate=false @@ -37,7 +58,3 @@ log4j.logger.org.codehaus.groovy.grails.plugins=info,stdout log4j.additivity.org.codehaus.groovy.grails.plugins=false log4j.logger.grails.spring=info,stdout log4j.additivity.grails.spring=false - -# This logger is for Grails' public APIs within the grails. package -log4j.logger.grails=info,stdout -log4j.additivity.grails=false racetrack_ch5/grails-app/conf/log4j.test.properties @@ -46,8 +46,8 @@ class RaceController { def race = Race.get( params.id ) if(race) { race.properties = params - if(race.save()) { - flash.message = "${params.name} updated." + if(race.save()) { + flash.message = "${params.name} updated." redirect(action:show,id:race.id) } else { @@ -70,7 +70,7 @@ class RaceController { def race = new Race() race.properties = params if(race.save()) { - flash.message = "${params.name} saved." + flash.message = "${params.name} saved." redirect(action:show,id:race.id) } else { @@ -78,42 +78,41 @@ class RaceController { } } - def search = { - if (request.method == 'POST') { - RaceQuery query = new RaceQuery() - bindData(query, params) - - def criteria = Race.createCriteria() - - def results = criteria { - and { - like('city', '%' + query.city + '%') - like('state', '%' + query.state + '%') - if (query.distance) { - switch (query.distanceOperator) { - case RaceQuery.DistanceOperator.AT_LEAST: - ge('distance', query.distance) - break - case RaceQuery.DistanceOperator.EXACTLY: - eq('distance', query.distance) - break - case RaceQuery.DistanceOperator.AT_MOST: - le('distance', query.distance) - break - default: - log.error "Found unexpected value for distance" - + " operator - ${query.distanceOperator}" - } - } - // Add 1 day (24 hours) to the max date. (If user selects a max - // date of Jan 1st, the date object will hold Jan 1st 00:00, but - // the user will want any events occurring thru Jan 1st 23:59.) - between('startDateTime', query.minDate, query.maxDate + 1) - } - } - - render(view:'list', model:[ raceList: results ]) - } - } - + def search = { + if (request.method == 'POST') { + RaceQuery query = new RaceQuery() + bindData(query, params) + + def criteria = Race.createCriteria() + + def results = criteria { + and { + like('city', '%' + query.city + '%') + like('state', '%' + query.state + '%') + if (query.distance) { + switch (query.distanceOperator) { + case RaceQuery.DistanceOperator.AT_LEAST: + ge('distance', query.distance) + break + case RaceQuery.DistanceOperator.EXACTLY: + eq('distance', query.distance) + break + case RaceQuery.DistanceOperator.AT_MOST: + le('distance', query.distance) + break + default: + log.error "Found unexpected value for distance" + + " operator - ${query.distanceOperator}" + } + } + // Add 1 day (24 hours) to the max date. If user selects a max + // date of Jan 1st, the date object will hold Jan 1st 00:00, but + // the user will want any events occurring thru Jan 1st 23:59. + between('startDateTime', query.minDate, query.maxDate + 1) + } + } + + render(view:'list', model:[ raceList: results.adaptee ]) + } + } } \ No newline at end of file racetrack_ch5/grails-app/controllers/RaceController.groovy @@ -47,7 +47,7 @@ class RegistrationController { if(registration) { registration.properties = params if(registration.save()) { - flash.message = "${params.name} updated." + flash.message = "${params.name} updated." redirect(action:show,id:registration.id) } else { @@ -70,7 +70,7 @@ class RegistrationController { def registration = new Registration() registration.properties = params if(registration.save()) { - flash.message = "${params.name} saved." + flash.message = "${params.name} saved." redirect(action:show,id:registration.id) } else { racetrack_ch5/grails-app/controllers/RegistrationController.groovy @@ -1,4 +1,4 @@ -class Race { +class Race { String name Date startDateTime String city @@ -7,16 +7,16 @@ class Race { Float cost Integer maxRunners = 100000 - static hasMany = [registrations:Registration] + static hasMany = [registrations:Registration] static constraints = { - name(maxLength:50,blank:false) - startDateTime(validator: {return (it > new Date())}) - city(maxLength:30,blank:false) + name(maxSize:50,blank:false) + startDateTime(validator: {return (it > new Date())}) + city(maxSize:30,blank:false) state(inList:['GA', 'NC', 'SC', 'VA'],blank:false) distance(min:3.1f,max:100f) cost(min:0f,max:999.99f) - } + } - String toString() {"${this.name} : ${this.city}, ${this.state}"} -} \ No newline at end of file + String toString() {"${this.name} : ${this.city}, ${this.state}" } +} racetrack_ch5/grails-app/domain/Race.groovy @@ -1,4 +1,4 @@ -class Registration { +class Registration { Race race String name Date dateOfBirth @@ -6,19 +6,17 @@ class Registration { String postalAddress String emailAddress Date createdAt = new Date() - + static belongsTo = Race - - static optionals = ["postalAddress" ] - + static constraints = { - name(maxLength:50,blank:false) + name(maxSize:50,blank:false) dateOfBirth(nullable:false) gender(inList:["M", "F"]) - postalAddress(maxLength:255) - emailAddress(maxLength:50,email:true) + postalAddress(nullable:true,maxSize:255) + emailAddress(maxSize:50,email:true) race(nullable:false) } - - String toString() {"${this.name} : ${this.emailAddress}"} -} \ No newline at end of file + + String toString(){"${this.name}:${this.emailAddress}"} +} racetrack_ch5/grails-app/domain/Registration.groovy @@ -1,29 +1,28 @@ default.doesnt.match.message=Property [{0}] of class [{1}] with value [{2}] does not match the required pattern [{3}] default.invalid.url.message=Property [{0}] of class [{1}] with value [{2}] is not a valid URL default.invalid.creditCard.message=Property [{0}] of class [{1}] with value [{2}] is not a valid credit card number -default.invalid.email.message=Property [{0}] of class [{1}] with value [{2}] is not a valid e-mail address. -default.invalid.message=Property [{0}] of class [{1}] is not a valid [{2}]. +default.invalid.email.message=Property [{0}] of class [{1}] with value [{2}] is not a valid e-mail address default.invalid.range.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid range from [{3}] to [{4}] default.invalid.size.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid size range from [{3}] to [{4}] -default.invalid.length.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid size range from [{3}] to [{4}] -default.invalid.min.message=Property [{0}] of class [{1}] with value [{2}] is less than minimum value [{3}] default.invalid.max.message=Property [{0}] of class [{1}] with value [{2}] exceeds maximum value [{3}] -default.invalid.max.length.message=Property [{0}] of class [{1}] with value [{2}] exceeds the maximum size of [{3}] -default.invalid.min.length.message=Property [{0}] of class [{1}] with value [{2}] is less than the minimum size of [{3}] +default.invalid.min.message=Property [{0}] of class [{1}] with value [{2}] is less than minimum value [{3}] default.invalid.max.size.message=Property [{0}] of class [{1}] with value [{2}] exceeds the maximum size of [{3}] default.invalid.min.size.message=Property [{0}] of class [{1}] with value [{2}] is less than the minimum size of [{3}] +default.invalid.validator.message=Property [{0}] of class [{1}] with value [{2}] does not pass custom validation default.not.inlist.message=Property [{0}] of class [{1}] with value [{2}] is not contained within the list [{3}] default.blank.message=Property [{0}] of class [{1}] cannot be blank default.not.equal.message=Property [{0}] of class [{1}] with value [{2}] cannot equal [{3}] default.null.message=Property [{0}] of class [{1}] cannot be null default.not.unique.message=Property [{0}] of class [{1}] with value [{2}] must be unique -default.not.editable.message=Property [{0}] of class [{1}] with value [{2}] cannot be changed from [{3}] -race.name.blank=Please enter a name for this race +default.paginate.prev=Previous +default.paginate.next=Next + +race.name.blank=Please enter a name for this race race.distance.max.exceeded=Please enter a valid distance no more than {3} miles race.startDateTime.validator.invalid=Please enter a future date and time race.city.blank=Please enter a city for this race -race.city.maxLength.exceeded=Please limit the city name to a maximum length of {3} characters +race.city.maxSize.exceeded=Please limit the city name to a maximum length of {3} characters race.distance.nullable=Please enter a valid distance race.distance.min.notmet=Please enter a valid distance no fewer than {3} miles race.distance.max.exceeded=Please enter a valid distance no more than {3} miles @@ -32,8 +31,8 @@ race.cost.min.notmet=Please enter a valid cost of at least ${3} race.cost.max.exceeded=Please enter a valid cost no more than ${3} registration.name.blank=Please enter a name -registration.name.maxLength.exceeded=Please limit the name to a maximum length of {3} characters -registration.postalAddress.maxLength.exceeded=Please limit the postal address to a maximum length of {3} characters +registration.name.maxSize.exceeded=Please limit the name to a maximum length of {3} characters +registration.postalAddress.maxSize.exceeded=Please limit the postal address to a maximum length of {3} characters registration.emailAddress.blank=Please enter an e-mail address -registration.emailAddress.maxLength.exceeded=Please limit the e-mail address to a maximum length of {3} characters +registration.emailAddress.maxSize.exceeded=Please limit the e-mail address to a maximum length of {3} characters registration.emailAddress.email.invalid=Please enter a valid e-mail address \ No newline at end of file racetrack_ch5/grails-app/i18n/messages.properties @@ -27,19 +27,19 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='startDateTime'>Start Date Time:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'startDateTime','errors')}'><g:datePicker name='startDateTime' value="${race?.startDateTime}"></g:datePicker></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='state'>State:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'state','errors')}'><g:select name='state' from='${race.constraints.state.inList.collect{it.encodeAsHTML()}}' value="${race.state?.encodeAsHTML()}"></g:select></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}" /></td></tr> </tbody> </table> racetrack_ch5/grails-app/views/race/create.gsp @@ -30,19 +30,19 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='startDateTime'>Start Date Time:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'startDateTime','errors')}'><g:datePicker name='startDateTime' value="${race?.startDateTime}"></g:datePicker></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='state'>State:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'state','errors')}'><g:select name='state' from='${race.constraints.state.inList.collect{it.encodeAsHTML()}}' value="${race.state?.encodeAsHTML()}"></g:select></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}" /></td></tr> <tr class='prop'><td valign='top' class='name'><label for='registrations'>Registrations:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'registrations','errors')}'><ul> <g:each var='r' in='${race?.registrations?}'> racetrack_ch5/grails-app/views/race/edit.gsp @@ -10,7 +10,7 @@ <span class="menuButton"><a href="${createLinkTo(dir:'')}">Home</a></span> <span class="menuButton"><g:link action="create">New Race</g:link></span> <span class="menuButton"> - <g:link action="search">Search for Races</g:link> + <g:link action="search">Search for Races</g:link> </span> </div> <div class="body"> @@ -23,17 +23,17 @@ <table> <thead> <tr> - <th>Name</th> - - <th>Start Date Time</th> - - <th>City</th> - - <th>State</th> - - <th>Distance</th> - - <th></th> + <g:sortableColumn property="name" title="Name" /> + + <g:sortableColumn property="startDateTime" title="Start Date Time" /> + + <g:sortableColumn property="city" title="City" /> + + <g:sortableColumn property="state" title="State" /> + + <g:sortableColumn property="distance" title="Distance" /> + + <th></th> </tr> </thead> <tbody> racetrack_ch5/grails-app/views/race/list.gsp @@ -28,34 +28,37 @@ <label for='state'>State:</label> </td> <td valign='top' class='value'> - <g:select name='state' from='${[""] + new Race().constraints.state.inList}'> + <g:select name='state' + from='${[""] + new Race().constraints.state.inList}'> </g:select> </td> </tr> - <tr class='prop'> - <td valign='top' class='name'> - <label for='date'>Date:</label> - </td> - <td valign='top' class='value'> - between - <g:datePicker name='minDate' precision='day' /> - and - <g:datePicker name='maxDate' precision='day' value='${new Date().plus(365*2)}'/> - </td> - </tr> - <tr class='prop'> - <td valign='top' class='name'> - <label for='distance'>Distance:</label> - </td> - <td valign='top' class='value'> - <select name='distanceOperator' > - <option value='AT_LEAST' >At least</option> - <option value='EXACTLY' >Exactly</option> - <option value='AT_MOST' >At most</option> - </select> - <input type='text' name='distance' size='5'></input> mi - </td> - </tr> + <tr class='prop'> + <td valign='top' class='name'> + <label for='date'>Date:</label> + </td> + <td valign='top' class='value'> + between + <g:datePicker name='minDate' precision='day' /> + and + <g:datePicker name='maxDate' precision='day' + value='${new Date().plus(365*2)}'/> + </td> + </tr> + <tr class='prop'> + <td valign='top' class='name'> + <label for='distance'>Distance:</label> + </td> + <td valign='top' class='value'> + <select name='distanceOperator' > + <option value='AT_LEAST' >At least</option> + <option value='EXACTLY' >Exactly</option> + <option value='AT_MOST' >At most</option> + </select> + <input type='text' name='distance' size='5'> + </input> mi + </td> + </tr> </table> </div> <div class="buttons"> racetrack_ch5/grails-app/views/race/search.gsp @@ -1,7 +1,7 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <g:javascript library="racetrack" /> <meta name="layout" content="main" /> <title>Show Race</title> racetrack_ch5/grails-app/views/race/show.gsp @@ -27,7 +27,7 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='dateOfBirth'>Date Of Birth:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'dateOfBirth','errors')}'><g:datePicker name='dateOfBirth' value="${registration?.dateOfBirth}" precision='day'></g:datePicker></td></tr> @@ -35,12 +35,10 @@ <tr class='prop'><td valign='top' class='name'><label for='postalAddress'>Postal Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'postalAddress','errors')}'><textarea rows='5' cols='40' name='postalAddress'>${registration?.postalAddress?.encodeAsHTML()}</textarea></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='race'>Race:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'race','errors')}'><g:select optionKey="id" from="${Race.list()}" name='race.id' value="${registration?.race?.id}"></g:select></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='createdAt'>Created At:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'createdAt','errors')}'><g:datePicker name='createdAt' value="${registration?.createdAt}"></g:datePicker></td></tr> - </tbody> </table> </div> racetrack_ch5/grails-app/views/registration/create.gsp @@ -30,7 +30,7 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='dateOfBirth'>Date Of Birth:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'dateOfBirth','errors')}'><g:datePicker name='dateOfBirth' value="${registration?.dateOfBirth}" precision='day'></g:datePicker></td></tr> @@ -38,7 +38,7 @@ <tr class='prop'><td valign='top' class='name'><label for='postalAddress'>Postal Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'postalAddress','errors')}'><textarea rows='5' cols='40' name='postalAddress'>${registration?.postalAddress?.encodeAsHTML()}</textarea></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='race'>Race:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'race','errors')}'><g:select optionKey="id" from="${Race.list()}" name='race.id' value="${registration?.race?.id}"></g:select></td></tr> @@ -50,7 +50,7 @@ <div class="buttons"> <span class="button"><g:actionSubmit value="Update" /></span> - <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRaceDelete();"/></span> + <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRegistrationDelete();" /></span> </div> </g:form> </div> racetrack_ch5/grails-app/views/registration/edit.gsp @@ -20,17 +20,17 @@ <table> <thead> <tr> - <th>Name</th> - - <th>Date Of Birth</th> - - <th>Gender</th> - - <th>Postal Address</th> - - <th>Email Address</th> - - <th></th> + <g:sortableColumn property="name" title="Name" /> + + <g:sortableColumn property="dateOfBirth" title="Date Of Birth" /> + + <g:sortableColumn property="gender" title="Gender" /> + + <g:sortableColumn property="postalAddress" title="Postal Address" /> + + <g:sortableColumn property="emailAddress" title="Email Address" /> + + <th></th> </tr> </thead> <tbody> racetrack_ch5/grails-app/views/registration/list.gsp @@ -77,7 +77,7 @@ <g:form controller="registration"> <input type="hidden" name="id" value="${registration?.id}" /> <span class="button"><g:actionSubmit value="Edit" /></span> - <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRaceDelete();"/></span> + <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRegistrationDelete();" /></span> </g:form> </div> </div> racetrack_ch5/grails-app/views/registration/show.gsp @@ -25,7 +25,10 @@ import org.springframework.context.NoSuchMessageException; import org.springframework.web.servlet.support.RequestContextUtils as RCU; import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU; -class ApplicationTagLib { +class ApplicationTagLib { + + def grailsUrlMappingsHolder + /** * Creates a link to a resource, generally used as a method rather than a tag. * @@ -33,7 +36,7 @@ class ApplicationTagLib { */ def createLinkTo = { attrs -> out << grailsAttributes.getApplicationUri(request) - if(attrs['dir']) { + if(attrs['dir'] || attrs['dir'] == '') { out << "/${attrs['dir']}" } if(attrs['file']) { @@ -50,7 +53,7 @@ class ApplicationTagLib { def link = { attrs, body -> out << "<a href=\"" // create the link - createLink(attrs) + out << createLink(attrs) out << '\" ' // process remaining attributes @@ -59,7 +62,7 @@ class ApplicationTagLib { } out << ">" // output the body - body() + out << body() // close tag out << "</a>" @@ -79,29 +82,47 @@ class ApplicationTagLib { if(attrs['url']) { attrs = attrs.remove('url') } - // if the current attribute null set the controller uri to the current controller - if(attrs["controller"]) { - out << '/' << attrs.remove("controller") - } - else { - out << grailsAttributes.getControllerUri(request) - } - if(attrs["action"]) { - out << '/' << attrs.remove("action") - } - if(attrs["id"]) { - out << '/' << attrs.remove("id") - } - if(attrs['params']) { - def pms = attrs.remove('params') - out << '?' - def i = 0 - pms.each { k,v -> - out << "${k.encodeAsURL()}=${v?.encodeAsURL()}" - if(++i < pms.size()) - out << '&' - } - } + + def controller = attrs.containsKey("controller") ? attrs.remove("controller") : grailsAttributes.getController(request).controllerName + def action = attrs.remove("action") + def id = attrs.remove("id") + def params = attrs.params ? attrs.remove('params') : [:] + + def url + try { + if(id) params.id = id + def mapping = grailsUrlMappingsHolder?.getReverseMapping(controller,action,params) + params.controller = controller + if(action) params.action = action + url = mapping?.createURL(params) + } + finally { + params.remove('controller') + params.remove('action') + params.remove('id') + } + if(url) { + out << url + } + else { + out << '/' << controller + if(action) { + out << '/' << action + } + if(id) { + out << '/' << id + } + if(params) { + out << '?' + def i = 0 + params.each { k,v -> + out << "${k.encodeAsURL()}=${v?.encodeAsURL()}" + if(++i < params.size()) + out << '&' + } + } + } + } /** @@ -127,8 +148,8 @@ class ApplicationTagLib { } } } - out << '>' - body() + out << '>' + out << body() out << "</${attrs.name}>" } } racetrack_ch5/plugins/core/grails-app/taglib/ApplicationTagLib.groovy @@ -16,6 +16,7 @@ import org.springframework.validation.Errors; import org.springframework.context.NoSuchMessageException; import org.springframework.web.servlet.support.RequestContextUtils as RCU; import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU; +import org.codehaus.groovy.grails.commons.DomainClassArtefactHandler; /** * A tag lib that provides tags for working with form controls @@ -33,7 +34,10 @@ class FormTagLib { def textField = { attrs -> attrs.type = "text" attrs.tagName = "textField" - field(attrs) + def result = field(attrs) + if(result) { + out << result + } } /** * Creates a hidden field @@ -41,7 +45,7 @@ class FormTagLib { def hiddenField = { attrs -> attrs.type = "hidden" attrs.tagName = "hiddenField" - field(attrs) + out << field(attrs) } /** * Creates a submit button @@ -49,7 +53,7 @@ class FormTagLib { def submitButton = { attrs -> attrs.type = "submit" attrs.tagName = "submitButton" - field(attrs) + out << field(attrs) } /** * A general tag for creating fields @@ -84,7 +88,7 @@ class FormTagLib { void resolveAttributes(attrs) { if(!attrs.name && !attrs.field) { - throwTagError("Tag [$tagName] is missing required attribute [name] or [field]") + throwTagError("Tag [${attrs.tagName}] is missing required attribute [name] or [field]") } attrs.remove('tagName') @@ -121,7 +125,7 @@ class FormTagLib { def form = { attrs, body -> out << "<form action=\"" // create the link - createLink(attrs) + out << createLink(attrs) out << '\" ' // default to post @@ -133,26 +137,34 @@ class FormTagLib { out << ">" // output the body - body() + def bodyContent = body() + out << bodyContent // close tag out << "</form>" } /** * Creates a submit button that submits to an action in the controller specified by the form action - * The value of the action attribute is translated into the action name, for example "Edit" becomes - * "edit" or "List People" becomes "listPeople" + * The name of the action attribute is translated into the action name, for example "Edit" becomes + * "_action_edit" or "List People" becomes "_action_listPeople" + * If the action attribute is not specified, the value attribute will be used as part of the action name * * <g:actionSubmit value="Edit" /> + * <g:actionSubmit action="Edit" value="Some label for editing" /> * */ def actionSubmit = { attrs -> - out << '<input type="submit" name="_action" ' - def value = attrs.remove('value') - if(value) { - out << "value=\"${value}\" " + if(!attrs.value) { + throwTagError("Tag [$tagName] is missing required attribute [value]") } - // process remaining attributes + + // add action and value + def value = attrs.remove('value') + def action = attrs.action ? attrs.remove('action') : value + + out << "<input type=\"submit\" name=\"_action_${action}\" value=\"${value}\" " + + // process remaining attributes outputAttributes(attrs) // close tag @@ -161,22 +173,30 @@ class FormTagLib { } /** * Creates a an image submit button that submits to an action in the controller specified by the form action - * The value of the action attribute is translated into the action name, for example "Edit" becomes - * "edit" or "List People" becomes "listPeople" + * The name of the action attribute is translated into the action name, for example "Edit" becomes + * "_action_edit" or "List People" becomes "_action_listPeople" + * If the action attribute is not specified, the value attribute will be used as part of the action name * * <g:actionSubmitImage src="/images/submitButton.gif" action="Edit" /> * */ def actionSubmitImage = { attrs -> - out << '<input type="image" name="_action" ' - def value = attrs.remove('value') - if(value) { - out << "value=\"${value}\" " + if(!attrs.value) { + throwTagError("Tag [$tagName] is missing required attribute [value]") } + + // add action and value + def value = attrs.remove('value') + def action = attrs.action ? attrs.remove('action') : value + + out << "<input type=\"image\" name=\"_action_${action}\" value=\"${value}\" " + + // add image src def src = attrs.remove('src') if(src) { out << "src=\"${src}\" " } + // process remaining attributes outputAttributes(attrs) @@ -201,6 +221,8 @@ class FormTagLib { def value = (attrs['value'] ? attrs['value'] : xdefault) def name = attrs['name'] + def id = attrs['id'] ? attrs['id'] : name + def noSelection = attrs['noSelection'] if (noSelection != null) { @@ -253,7 +275,7 @@ class FormTagLib { // create day select if (precision >= PRECISION_RANKINGS["day"]) { - out.println "<select name=\"${name}_day\">" + out.println "<select name=\"${name}_day\" id=\"${id}_day\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -272,7 +294,7 @@ class FormTagLib { // create month select if (precision >= PRECISION_RANKINGS["month"]) { - out.println "<select name=\"${name}_month\">" + out.println "<select name=\"${name}_month\" id=\"${id}_month\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -294,7 +316,7 @@ class FormTagLib { // create year select if (precision >= PRECISION_RANKINGS["year"]) { - out.println "<select name=\"${name}_year\">" + out.println "<select name=\"${name}_year\" id=\"${id}_year\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -313,7 +335,7 @@ class FormTagLib { // do hour select if (precision >= PRECISION_RANKINGS["hour"]) { - out.println "<select name=\"${name}_hour\">" + out.println "<select name=\"${name}_hour\" id=\"${id}_hour\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -338,7 +360,7 @@ class FormTagLib { // do minute select if (precision >= PRECISION_RANKINGS["minute"]) { - out.println "<select name=\"${name}_minute\">" + out.println "<select name=\"${name}_minute\" id=\"${id}_minute\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -360,7 +382,7 @@ class FormTagLib { def renderNoSelectionOption = { noSelectionKey, noSelectionValue, value -> // If a label for the '--Please choose--' first item is supplied, write it out out << '<option value="' << (noSelectionKey == null ? "" : noSelectionKey) << '"' - if(noSelectionKey == value) { + if(noSelectionKey.equals(value)) { out << ' selected="selected" ' } out << '>' << noSelectionValue.encodeAsHTML() << '</option>' @@ -388,7 +410,7 @@ class FormTagLib { } // use generic select - select( attrs ) + out << select( attrs ) } /** @@ -405,7 +427,7 @@ class FormTagLib { attrs['optionValue'] = { "${it.language}, ${it.country}, ${it.displayName}" } // use generic select - select( attrs ) + out << select( attrs ) } /** @@ -425,7 +447,7 @@ class FormTagLib { attrs.value = null } // invoke generic select - select( attrs ) + out << select( attrs ) } /** @@ -436,11 +458,15 @@ class FormTagLib { * <g:select name="user.company.id" from="${Company.list()}" value="${user?.company.id}" optionKey="id" /> */ def select = { attrs -> + def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource") + def locale = RCU.getLocale(request) + def from = attrs.remove('from') def keys = attrs.remove('keys') def optionKey = attrs.remove('optionKey') def optionValue = attrs.remove('optionValue') def value = attrs.remove('value') + def valueMessagePrefix = attrs.remove('valueMessagePrefix') def noSelection = attrs.remove('noSelection') if (noSelection != null) { noSelection = noSelection.entrySet().iterator().next() @@ -461,20 +487,21 @@ class FormTagLib { // create options from list if(from) { from.eachWithIndex { el,i -> + def keyValue = null out << '<option ' if(keys) { - out << 'value="' << keys[i] << '" ' - if(keys[i] == value) { + keyValue = keys[i] + out << 'value="' << keyValue << '" ' + if(keyValue == value) { out << 'selected="selected" ' } } - else if(optionKey) { - def keyValue = null + else if(optionKey) { if(optionKey instanceof Closure) { keyValue = optionKey(el) - out << 'value="' << keyValue << '" ' + out << 'value="' << keyValue << '" ' } - else if(el !=null && optionKey == 'id' && grailsApplication.getGrailsDomainClass(el.getClass().name)) { + else if(el !=null && optionKey == 'id' && grailsApplication.getArtefact(DomainClassArtefactHandler.TYPE, el.getClass().name)) { keyValue = el.ident() out << 'value="' << keyValue << '" ' } @@ -488,8 +515,9 @@ class FormTagLib { } } else { - out << "value=\"${el}\" " - if(el == value) { + keyValue = el + out << "value=\"${keyValue}\" " + if(keyValue == value) { out << 'selected="selected" ' } } @@ -502,6 +530,19 @@ class FormTagLib { out << el.properties[optionValue].toString().encodeAsHTML() } } + else if(valueMessagePrefix) { + def message = messageSource.getMessage("${valueMessagePrefix}.${keyValue}", null, null, locale) + if(message) { + out << message.encodeAsHTML() + } + else if (keyValue) { + out << keyValue.encodeAsHTML() + } + else { + def s = el.toString() + if(s) out << s.encodeAsHTML() + } + } else { def s = el.toString() if(s) out << s.encodeAsHTML() @@ -554,6 +595,6 @@ class FormTagLib { outputAttributes(attrs) // close the tag, with no body - out << ' ></input>' + out << ' />' } } \ No newline at end of file racetrack_ch5/plugins/core/grails-app/taglib/FormTagLib.groovy @@ -95,7 +95,7 @@ class JavascriptTagLib { } else { out.println '<script type="text/javascript">' - body() + out << body() out.println '</script>' } } @@ -137,15 +137,15 @@ class JavascriptTagLib { /** * A link to a remote uri that used the prototype library to invoke the link via ajax */ - def remoteLink = { attrs, body -> + def remoteLink = { attrs, body -> out << "<a href=\"" def cloned = deepClone(attrs) - createLink(cloned) + out << createLink(cloned) out << "\" onclick=\"" // create remote function - remoteFunction(attrs) + out << remoteFunction(attrs) attrs.remove('url') out << "return false;\" " // process remaining attributes @@ -154,7 +154,7 @@ class JavascriptTagLib { } out << ">" // output the body - body() + out << body() // close tag out << "</a>" @@ -180,7 +180,7 @@ class JavascriptTagLib { else { attrs.params = "'${paramName}='+this.value" } - remoteFunction(attrs) + out << remoteFunction(attrs) attrs.remove('params') out << "\"" attrs.remove('url') @@ -208,16 +208,16 @@ class JavascriptTagLib { // prepare form settings prepareAjaxForm(p,attrs) - def params = [ onsubmit:TagLibUtil.outToString(remoteFunction,attrs) + 'return false', + def params = [ onsubmit:remoteFunction(attrs) + 'return false', method: (attrs.method? attrs.method : 'POST' ), - action: (attrs.action? attrs.action : TagLibUtil.outToString(createLink,url)) + action: (attrs.action? attrs.action : createLink(url)) ] attrs.remove('url') params.putAll(attrs) if(params.name && !params.id) params.id = params.name - withTag(name:'form',attrs:params) { - body() + out << withTag(name:'form',attrs:params) { + out << body() } } @@ -230,7 +230,7 @@ class JavascriptTagLib { // prepare form settings attrs.forSubmitTag = ".form" prepareAjaxForm(p,attrs) - def params = [ onclick:TagLibUtil.outToString(remoteFunction,attrs) + 'return false', + def params = [ onclick:remoteFunction(attrs) + 'return false', type: 'button', name: attrs.remove('name'), value: attrs.remove('value'), @@ -238,8 +238,8 @@ class JavascriptTagLib { 'class':attrs.remove('class') ] - withTag(name:'input', attrs:params) { - body() + out << withTag(name:'input', attrs:params) { + out << body() } } @@ -275,7 +275,7 @@ class JavascriptTagLib { def sw = new StringWriter() out = new PrintWriter(out) // invoke body - body() + out << body() // restore out out = tmp js = sw.toString() @@ -357,10 +357,10 @@ class PrototypeProvider implements JavascriptProvider { def pms = attrs.remove('params') if(attrs.url) { - taglib.createLink(attrs.url) + out << taglib.createLink(attrs.url) } else { - taglib.createLink(attrs) + out << taglib.createLink(attrs) } @@ -415,6 +415,7 @@ class PrototypeProvider implements JavascriptProvider { case 'true': ajaxOptions << "${k}:${v}"; break; case 'false': ajaxOptions << "${k}:${v}"; break; case ~/\s*function(\w*)\s*/: ajaxOptions << "${k}:${v}"; break; + case ~/Insertion\..*/: ajaxOptions << "${k}:${v}"; break; default:ajaxOptions << "${k}:'${v}'"; break; } } @@ -441,10 +442,10 @@ class YahooProvider implements JavascriptProvider { out << "YAHOO.util.Connect.asyncRequest('${method}','" if(attrs.url) { - taglib.createLink(attrs.url) + out << taglib.createLink(attrs.url) } else { - taglib.createLink(attrs) + out << taglib.createLink(attrs) } attrs.remove('url') out << "'," @@ -504,7 +505,7 @@ class DojoProvider implements JavascriptProvider { } out << 'dojo.io.bind({url:\'' - taglib.createLink(attrs) + out << taglib.createLink(attrs) attrs.remove('params') out << '\',load:function(type,data,evt) {' if(attrs.onLoaded) { racetrack_ch5/plugins/core/grails-app/taglib/JavascriptTagLib.groovy @@ -25,6 +25,7 @@ import org.springframework.web.servlet.support.RequestContextUtils as RCU; import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU; class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants { + def out // to facilitate testing protected getPage() { return request[PAGE] @@ -91,7 +92,7 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants } } if(invokeBody) { - body(); + out << body() } } } @@ -134,54 +135,183 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants if(attrs.total == null) throwTagError("Tag [paginate] is missing required attribute [total]") - def mkp = new groovy.xml.MarkupBuilder(out) + def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource") + def locale = RCU.getLocale(request) + def total = attrs.total.toInteger() - def max = params.max?.toInteger() - def offset = params.offset?.toInteger() def action = (attrs.action? attrs.action : 'list') - def breadcrumb = true - if(attrs.breadcrumb) breadcrumb = Boolean.valueOf(attrs.breadcrumb) - + def offset = params.offset?.toInteger() + def max = params.max?.toInteger() + def maxsteps = (attrs.maxsteps ? attrs.maxsteps.toInteger() : 10) + + if(attrs.breadcrumb) { + log.warn("Tag [paginate] includes the [breadcrumb] attribute. This attribute is deprecated and will be removed in the future. Please update your code to use the [maxsteps] attribute instead.") + } + + if(!offset) offset = (attrs.offset ? attrs.offset.toInteger() : 0) if(!max) max = (attrs.max ? attrs.max.toInteger() : 10) - if(!offset) offset = (attrs.offset ? attrs.offset.toInteger() : 0) - def linkParams = [offset:offset-max,max:max] - def linkTagAttrs = ['class':'prevLink',action:action] + def linkParams = [offset:offset - max, max:max] + if(params.sort) linkParams.sort = params.sort + if(params.order) linkParams.order = params.order + if(attrs.params) linkParams.putAll(attrs.params) + + def linkTagAttrs = [action:action] if(attrs.controller) { linkTagAttrs.controller = attrs.controller } if(attrs.id) { linkTagAttrs.id = attrs.id } - if(attrs.params)linkParams.putAll(attrs.params) linkTagAttrs.params = linkParams - - def combined = max + offset - if(offset > 0) { - link(linkTagAttrs.clone(),{out<< (attrs.prev? attrs.prev : 'Previous' ) }) + + // determine paging variables + def steps = maxsteps > 0 + int currentstep = (offset / max) + 1 + int firststep = 1 + int laststep = Math.round(Math.ceil(total / max)) + + // display previous link when not on firststep + if(currentstep > firststep) { + linkTagAttrs.class = 'prevLink' + out << link(linkTagAttrs.clone()) { + (attrs.prev ? attrs.prev : messageSource.getMessage('default.paginate.prev', null, 'Previous', locale)) + } } - if(total > max) { - linkTagAttrs.'class' = 'step' - if(breadcrumb) { - def j = 0 - 0.step(total,max) { i -> - if(offset == i) { - mkp.a('class':'step',"${++j}") - } - else { - linkParams.offset=i - link(linkTagAttrs.clone(),{out<<++j}) - } - } + // display steps when steps are enabled and laststep is not firststep + if(steps && laststep > firststep) { + linkTagAttrs.class = 'step' + + // determine begin and endstep paging variables + int beginstep = currentstep - Math.round(maxsteps / 2) + (maxsteps % 2) + int endstep = currentstep + Math.round(maxsteps / 2) - 1 + + if(beginstep < firststep) { + beginstep = firststep + endstep = maxsteps + } + if(endstep > laststep) { + beginstep = laststep - maxsteps + 1 + if(beginstep < firststep) { + beginstep = firststep + } + endstep = laststep + } + + // display firststep link when beginstep is not firststep + if(beginstep > firststep) { + linkParams.offset = 0 + out << link(linkTagAttrs.clone()) {firststep.toString()} + out << '<span class="step">..</span>' + } + + // display paginate steps + (beginstep..endstep).each { i -> + if(currentstep == i) { + out << "<span class=\"currentStep\">${i}</span>" + } + else { + linkParams.offset = (i - 1) * max + out << link(linkTagAttrs.clone()) {i.toString()} + } + } + + // display laststep link when endstep is not laststep + if(endstep < laststep) { + out << '<span class="step">..</span>' + linkParams.offset = (laststep -1) * max + out << link(linkTagAttrs.clone()) { laststep.toString() } + } + } + + // display next link when not on laststep + if(currentstep < laststep) { + linkTagAttrs.class = 'nextLink' + linkParams.offset = offset + max + out << link(linkTagAttrs.clone()) { + (attrs.next ? attrs.next : messageSource.getMessage('default.paginate.next', null, 'Next', locale)) } } - linkParams.offset = offset+max - if(combined < total) { - linkTagAttrs.'class'='nextLink' - link(linkTagAttrs,{out<< (attrs.'next'? attrs.'next' : 'Next' )}) + + } + + /** + * Renders a sortable column to support sorting in list views + * + * Attributes: + * + * property - name of the property relating to the field + * defaultOrder (optional) - default order for the property; choose between asc (default if not provided) and desc + * title (optional*) - title caption for the column + * titleKey (optional*) - title key to use for the column, resolved against the message source + * params (optional) - a map containing request parameters + * + * Attribute title or titleKey is required. When both attributes are specified then titleKey takes precedence, + * resulting in the title caption to be resolved against the message source. In case when the message could + * not be resolved, the title will be used as title caption. + * + * Examples: + * + * <g:sortableColumn property="title" title="Title" /> + * <g:sortableColumn property="title" title="Title" style="width: 200px" /> + * <g:sortableColumn property="title" titleKey="book.title" /> + * <g:sortableColumn property="releaseDate" defaultOrder="desc" title="Release Date" /> + * <g:sortableColumn property="releaseDate" defaultOrder="desc" title="Release Date" titleKey="book.releaseDate" /> + */ + def sortableColumn = { attrs -> + + if(!attrs.property) + throwTagError("Tag [sortableColumn] is missing required attribute [property]") + + if(!attrs.title && !attrs.titleKey) + throwTagError("Tag [sortableColumn] is missing required attribute [title] or [titleKey]") + + def property = attrs.remove("property") + def action = attrs.action ? attrs.remove("action") : "list" + + def defaultOrder = attrs.remove("defaultOrder") + if(defaultOrder != "desc") defaultOrder = "asc" + + // current sorting property and order + def sort = params.sort + def order = params.order + + // add sorting property and params to link params + def linkParams = [sort:property] + if(attrs.params) linkParams.putAll(attrs.params) + + // determine and add sorting order for this column to link params + attrs.class = "sortable" + if(property == sort) { + attrs.class = attrs.class + " sorted " + order + if(order == "asc") { + linkParams.order = "desc" + } + else { + linkParams.order = "asc" + } + } + else { + linkParams.order = defaultOrder + } + + // determine column title + def title = attrs.remove("title") + def titleKey = attrs.remove("titleKey") + if(titleKey) { + if(!title) title = titleKey + def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource") + def locale = RCU.getLocale(request) + title = messageSource.getMessage(titleKey, null, title, locale) } + out << "<th " + // process remaining attributes + attrs.each { k, v -> + out << "${k}=\"${v.encodeAsHTML()}\" " + } + out << ">${link(action:action, params:linkParams) { title }}</th>" } /** @@ -199,14 +329,7 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants def uri = grailsAttributes.getTemplateUri(attrs.template,request) def var = attrs['var'] - def url = servletContext.getResource(uri) - if(!url) - throwTagError("No template found for name [${attrs.template}] in tag [render]") - - def t = engine.createTemplate( uri, - servletContext, - request, - response) + def t = engine.createTemplate( uri ) if(attrs.model instanceof Map) { t.make( attrs.model ).writeTo(out) @@ -246,14 +369,7 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants def engine = grailsAttributes.getPagesTemplateEngine() def uri = grailsAttributes.getTemplateUri(attrs.template,request) - def url = servletContext.getResource(uri) - if(!url) - throwTagError("No template found for name [${attrs.template}] in tag [include]") - - def t = engine.createTemplate( uri, - servletContext, - request, - response) + def t = engine.createTemplate( uri ) t.make().writeTo(out) } racetrack_ch5/plugins/core/grails-app/taglib/RenderTagLib.groovy @@ -152,7 +152,7 @@ class UITagLib { * <g:richTextEditor name="editor" height="400" /> */ def richTextEditor = { attrs -> - withTag(name:'script',attributes:[type:'text/javascript']) { + out << withTag(name:'script',attributes:[type:'text/javascript']) { if(attrs.onComplete) { out.println "function FCKeditor_OnComplete( editorInstance ) {" out.println "${attrs.onComplete}(editorInstance);" @@ -162,24 +162,53 @@ class UITagLib { var oFCKeditor = new FCKeditor( '${attrs.name}' ) ; oFCKeditor.BasePath = \"""" if(attrs.basepath) { - createLinkTo(dir:attrs.basepath) + out << createLinkTo(dir:attrs.basepath) } else { - createLinkTo(dir:"fckeditor/") + out << createLinkTo(dir:"fckeditor/") } out.println '";' if(attrs.toolbar) { out << "oFCKeditor.ToolbarSet = '${attrs.toolbar}';" - } + } + // add width support + if(attrs.width) + out.println "oFCKeditor.Width = '${attrs.width}';" + if(attrs.height) - out.println "oFCKeditor.Height = ${attrs.height};" + out.println "oFCKeditor.Height = '${attrs.height}';" + + // add skin support, values to choose: "default", "office2003", "silver" + if(attrs.skin) + out.println "oFCKeditor.Config['SkinPath'] = 'skins/${attrs.skin}/';" + + // check the browser compatibility when rendering the editor. default value: true, values to choose: true, false, + if(attrs.checkBrowser) + out.println "oFCKeditor.CheckBrowser = ${attrs.checkBrowser};" + + // show error messages on errors while rendering the editor. default value: true, values to choose: true, false + if(attrs.displayErrors) + out.println "oFCKeditor.DisplayErrors = ${attrs.displayErrors};" + + // oFCKeditor.Config AutoDetectLanguage:true/false, DefaultLanguage:'pt-BR' and so on + if(attrs.config) { + if (attrs.config instanceof Map) { + attrs.config.each { k, v -> + out.println "oFCKeditor.Config['$k'] = '$v';" + } + } else { + throw new Exception("""The format of config is not correct, it should be like "[AutoDetectLanguage:false, DefaultLanguage:'pt-BR']" """) + } + } + if(attrs.value) { out << "oFCKeditor.Value = \"" - escapeJavascript(Collections.EMPTY_MAP,attrs.value) + out << escapeJavascript(Collections.EMPTY_MAP,attrs.value) out.println "\" ;" } - out.println "oFCKeditor.Create();" + out.println "oFCKeditor.Create();" + } } } \ No newline at end of file racetrack_ch5/plugins/core/grails-app/taglib/UITagLib.groovy @@ -32,9 +32,7 @@ class ValidationTagLib { def model = attrs['model'] def checkList = [] if(model) { - checkList = model.findAll { k,v -> - return ((v.errors != null) && (v.errors instanceof Errors)) - } + checkList = model.findAll { it.value?.errors instanceof Errors }.collect { it.value } } if(attrs['bean']) { checkList << attrs['bean'] @@ -45,7 +43,7 @@ class ValidationTagLib { if(ra) { if(ra instanceof Errors) checkList << ra - else if ((ra.properties.errors) && (ra.errors instanceof Errors)) { + else if (ra.properties?.errors instanceof Errors) { checkList << ra } } @@ -55,23 +53,29 @@ class ValidationTagLib { for(i in checkList) { def errors = null - if(i instanceof Errors) { + if (i instanceof Errors) { errors = i } - else { - if ((i.errors != null) && (i.errors instanceof Errors)) { - if (i.hasErrors()) - errors = i.errors - } + else { + try { + if ((i.errors != null) && (i.errors instanceof Errors)) { + if (i.hasErrors()) + errors = i.errors + } + + } + catch(MissingPropertyException mpe) { + // ignore + } } if(errors) { if(attrs['field']) { if(errors.hasFieldErrors(attrs['field'])) { - body() + out << body() } } else { - body() + out << body() } } } @@ -84,9 +88,7 @@ class ValidationTagLib { def model = attrs['model'] def errorList = [] if(model) { - errorList = model.findAll { k,v -> - return ((v.errors != null) && (v.errors instanceof Errors)) - } + errorList = model.findAll { it.value?.errors instanceof Errors }.collect { it.value } } if(attrs['bean']) { errorList << attrs['bean'] @@ -95,9 +97,9 @@ class ValidationTagLib { request.attributeNames.each { def ra = request[it] if(ra) { - if(ra instanceof Errors) + if (ra instanceof Errors) errorList << ra - else if ((ra.errors != null) && (ra.errors instanceof Errors)) { + else if (ra.properties?.errors instanceof Errors) { errorList << ra } } @@ -119,13 +121,13 @@ class ValidationTagLib { if(attrs['field']) { if(errors.hasFieldErrors(attrs['field'])) { errors.getFieldErrors( attrs["field"] ).each { - body(it) + out << body(it) } } } else { errors.allErrors.each { - body( it ) + out << body( it ) } } } @@ -141,9 +143,9 @@ class ValidationTagLib { if(renderAs == 'list') { out << "<ul>" - eachError(attrs, { + out << eachError(attrs, { out << "<li>" - message(error:it) + out << message(error:it) out << "</li>" } ) @@ -219,7 +221,7 @@ class ValidationTagLib { } def app = grailsAttributes.getGrailsApplication() - def dc = app.getGrailsDomainClass(againstClass) + def dc = app.getDomainClass(againstClass) if(!dc) throwTagError("Tag [validate] could not find a domain class to validate against for name [${againstClass}]") racetrack_ch5/plugins/core/grails-app/taglib/ValidationTagLib.groovy @@ -8,7 +8,7 @@ class URLCodec { } static decode = { obj -> - URLEncoder.decode(obj.toString(), URLCodec.getEncoding()) + URLDecoder.decode(obj.toString(), URLCodec.getEncoding()) } private static def getEncoding() { racetrack_ch5/plugins/core/grails-app/utils/URLCodec.groovy @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> - -<beans> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> </beans> \ No newline at end of file racetrack_ch5/spring/resources.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> -<beans> <bean id="grailsApplication" class="org.codehaus.groovy.grails.commons.GrailsApplicationFactoryBean"> <description>Grails application factory bean</description> <property name="groovyFiles"> @@ -25,7 +27,7 @@ <property name="pluginManager" ref="pluginManager" /> </bean> - <bean id="grailsResourceHolder" singleton="false" class="org.codehaus.groovy.grails.commons.spring.GrailsResourceHolder"> + <bean id="grailsResourceHolder" scope="prototype" class="org.codehaus.groovy.grails.commons.spring.GrailsResourceHolder"> <property name="resources"> <value>classpath*:**/grails-app/**/*.groovy</value> </property> racetrack_ch5/web-app/WEB-INF/applicationContext.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> - -<beans> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> </beans> \ No newline at end of file racetrack_ch5/web-app/WEB-INF/spring/resources.xml @@ -10,6 +10,254 @@ <uri>http://grails.codehaus.org/tags</uri> <tag> + <description> + Enables the storing of a value into the given ${var} + </description> + <name>set</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovySetTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The value to store</description> + <name>value</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The name of the variable to store the value in</description> + <name>var</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Enables the storing of a value into the given ${var} into the page context + </description> + <name>def</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyDefTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The value to store</description> + <name>value</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The name of the variable to store the value in</description> + <name>var</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Logical if tag to test whether the given condition is true + </description> + <name>if</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyIfTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The condition to test</description> + <name>test</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Logical else tag as fallback if the if condition fails + </description> + <name>else</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyElseTag</tag-class> + <body-content>JSP</body-content> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Logical elseif tag to test whether the given condition is true + </description> + <name>elseif</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyElseIfTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The condition to test</description> + <name>test</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Tag to loop over a collection while the test expression returns true + </description> + <name>while</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyWhileTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The condition to test</description> + <name>test</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection</description> + <name>each</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyEachTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>true</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection</description> + <name>findAll</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyFindAllTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The expression to filter the elements to iterate over</description> + <name>expr</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>true</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection and collects the elements + you want to work with</description> + <name>collect</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyCollectTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The expression to use to collect the elements. The + expression must retur true to add the element to the + collection</description> + <name>expr</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection and filters the elements + with a regular expression</description> + <name>grep</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyGrepTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The regular expression to filter the element with. The + filter is a simple Groovy Regex</description> + <name>filter</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description>A tag that attempts to render an input for a bean property + into an appropriate component based on the type. It uses the templates + defined in "grails-app/views/scaffolding" to achieve this by looking up + the template by type.</description> + <name>renderInput</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyRenderInputTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The Bean to render the input for</description> + <name>bean</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The property of the bean to render input for</description> + <name>property</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> <name>link</name> <tag-class>org.codehaus.groovy.grails.web.taglib.jsp.JspLinkTag</tag-class> <body-content>JSP</body-content> racetrack_ch5/web-app/WEB-INF/tld/grails.tld @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" racetrack_ch5/web-app/WEB-INF/web.template.xml @@ -1,4 +1,4 @@ -<web-app xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd' version='2.4' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://java.sun.com/xml/ns/j2ee'><context-param><param-name>log4jConfigLocation</param-name><param-value>/WEB-INF/classes/log4j.properties</param-value></context-param><context-param><param-name>contextConfigLocation</param-name><param-value>/WEB-INF/applicationContext.xml</param-value></context-param><context-param><param-name>webAppRootKey</param-name><param-value>racetrack</param-value></context-param><filter><filter-name>sitemesh</filter-name><filter-class>org.codehaus.groovy.grails.web.sitemesh.GrailsPageFilter</filter-class></filter><filter><filter-name>charEncodingFilter</filter-name><filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class><init-param><param-name>targetBeanName</param-name><param-value>characterEncodingFilter</param-value></init-param><init-param><param-name>targetFilterLifecycle</param-name><param-value>true</param-value></init-param></filter><filter><filter-name>grailsWebRequest</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequestFilter</filter-class></filter><filter><filter-name>reloadFilter</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.filter.GrailsReloadServletFilter</filter-class></filter><filter-mapping><filter-name>charEncodingFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>grailsWebRequest</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>sitemesh</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>reloadFilter</filter-name><url-pattern>/registration/*</url-pattern></filter-mapping><filter-mapping><filter-name>reloadFilter</filter-name><url-pattern>/race/*</url-pattern></filter-mapping><listener><listener-class>org.springframework.web.util.Log4jConfigListener</listener-class></listener><listener><listener-class>org.codehaus.groovy.grails.web.context.GrailsContextLoaderListener</listener-class></listener><servlet><servlet-name>grails</servlet-name><servlet-class>org.codehaus.groovy.grails.web.servlet.GrailsDispatcherServlet</servlet-class><load-on-startup>1</load-on-startup></servlet><servlet><servlet-name>gsp</servlet-name><servlet-class>org.codehaus.groovy.grails.web.pages.GroovyPagesServlet</servlet-class><init-param><description> +<web-app xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd' version='2.4' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://java.sun.com/xml/ns/j2ee'><context-param><param-name>log4jConfigLocation</param-name><param-value>/WEB-INF/classes/log4j.properties</param-value></context-param><context-param><param-name>log4jRefreshInterval</param-name><param-value>1000</param-value></context-param><context-param><param-name>contextConfigLocation</param-name><param-value>/WEB-INF/applicationContext.xml</param-value></context-param><context-param><param-name>webAppRootKey</param-name><param-value>racetrack</param-value></context-param><filter><filter-name>sitemesh</filter-name><filter-class>org.codehaus.groovy.grails.web.sitemesh.GrailsPageFilter</filter-class></filter><filter><filter-name>charEncodingFilter</filter-name><filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class><init-param><param-name>targetBeanName</param-name><param-value>characterEncodingFilter</param-value></init-param><init-param><param-name>targetFilterLifecycle</param-name><param-value>true</param-value></init-param></filter><filter><filter-name>grailsWebRequest</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequestFilter</filter-class></filter><filter><filter-name>urlMapping</filter-name><filter-class>org.codehaus.groovy.grails.web.mapping.filter.UrlMappingsFilter</filter-class></filter><filter><filter-name>reloadFilter</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.filter.GrailsReloadServletFilter</filter-class></filter><filter-mapping><filter-name>charEncodingFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>grailsWebRequest</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>reloadFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>sitemesh</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>urlMapping</filter-name><url-pattern>/*</url-pattern></filter-mapping><listener><listener-class>org.springframework.web.util.Log4jConfigListener</listener-class></listener><listener><listener-class>org.codehaus.groovy.grails.web.context.GrailsContextLoaderListener</listener-class></listener><servlet><servlet-name>grails</servlet-name><servlet-class>org.codehaus.groovy.grails.web.servlet.GrailsDispatcherServlet</servlet-class><load-on-startup>1</load-on-startup></servlet><servlet><servlet-name>gsp</servlet-name><servlet-class>org.codehaus.groovy.grails.web.pages.GroovyPagesServlet</servlet-class><init-param><description> Allows developers to view the intermediade source code, when they pass - a spillGroovy argument in the URL. - </description><param-name>showSource</param-name><param-value>1</param-value></init-param></servlet><servlet-mapping><servlet-name>gsp</servlet-name><url-pattern>*.gsp</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>/registration/*</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>/race/*</url-pattern></servlet-mapping><welcome-file-list><welcome-file>index.jsp</welcome-file><welcome-file>index.gsp</welcome-file></welcome-file-list><jsp-config><taglib><taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri><taglib-location>/WEB-INF/tld/c.tld</taglib-location></taglib><taglib><taglib-uri>http://java.sun.com/jsp/jstl/fmt</taglib-uri><taglib-location>/WEB-INF/tld/fmt.tld</taglib-location></taglib><taglib><taglib-uri>http://www.springframework.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/spring.tld</taglib-location></taglib><taglib><taglib-uri>http://grails.codehaus.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/grails.tld</taglib-location></taglib></jsp-config></web-app> \ No newline at end of file + a spillGroovy argument in the URL. + </description><param-name>showSource</param-name><param-value>1</param-value></init-param></servlet><servlet-mapping><servlet-name>gsp</servlet-name><url-pattern>*.gsp</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>*.dispatch</url-pattern></servlet-mapping><welcome-file-list><welcome-file>index.jsp</welcome-file><welcome-file>index.gsp</welcome-file></welcome-file-list><jsp-config><taglib><taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri><taglib-location>/WEB-INF/tld/c.tld</taglib-location></taglib><taglib><taglib-uri>http://java.sun.com/jsp/jstl/fmt</taglib-uri><taglib-location>/WEB-INF/tld/fmt.tld</taglib-location></taglib><taglib><taglib-uri>http://www.springframework.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/spring.tld</taglib-location></taglib><taglib><taglib-uri>http://grails.codehaus.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/grails.tld</taglib-location></taglib></jsp-config></web-app> \ No newline at end of file racetrack_ch5/web-app/WEB-INF/web.xml @@ -124,4 +124,15 @@ td .errors { .prop .value { text-align:left; width:80%; +} + +.prevLink, .step, .currentStep, .nextLink { + padding-right: 5px; +} +.currentStep { + font-weight:bold; +} + +th.sorted a, th.sorted a:link, th.sorted a:visited, th.sorted a:hover, th.sortable a, th.sortable a:link, th.sortable a:visited, th.sortable a:hover { + color: white; } \ No newline at end of file racetrack_ch5/web-app/css/main.css @@ -1,7 +1,7 @@ function warnBeforeRaceDelete() { return confirm('Are you sure you want to delete this race?') -} +} function warnBeforeRegistrationDelete() { return confirm('Are you sure you want to delete this registration?') -} \ No newline at end of file +} racetrack_ch5/web-app/js/racetrack.js @@ -10,7 +10,9 @@ <classpathentry kind="src" path="grails-tests"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="var" path="GRAILS_HOME/ant/lib/ant.jar"/> - <classpathentry kind="var" path="GRAILS_HOME/lib/ant-nodeps.jar" /> + <classpathentry kind="var" path="GRAILS_HOME/lib/ant-junit.jar" /> + +<classpathentry kind="var" path="GRAILS_HOME/lib/ant-nodeps.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/ant.jar" /> @@ -48,9 +50,9 @@ <classpathentry kind="var" path="GRAILS_HOME/lib/ejb3-persistence.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/gant-0.2.2-SNAPSHOT.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/gant-0.2.5-SNAPSHOT.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/groovy-all-1.0.1-SNAPSHOT.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/groovy-all-1.1-BETA-1.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/groovy-starter.jar" /> @@ -80,13 +82,13 @@ <classpathentry kind="var" path="GRAILS_HOME/lib/log4j-1.2.8.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/ognl-2.7.jar" /> - <classpathentry kind="var" path="GRAILS_HOME/lib/org.mortbay.jetty.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/oro-2.0.8.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/quartz-1.5.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/quartz-1.6.0.jar" /> + +<classpathentry kind="var" path="GRAILS_HOME/lib/serializer.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/servletapi-2.4.jar" /> @@ -106,18 +108,20 @@ <classpathentry kind="var" path="GRAILS_HOME/lib/standard-2.4.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/xalan.jar" /> + <classpathentry kind="var" path="GRAILS_HOME/lib/xerces-2.6.2.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/xml-apis.jar" /> - <classpathentry kind="var" path="GRAILS_HOME/dist/grails-core-0.4.2.jar" /> + <classpathentry kind="var" path="GRAILS_HOME/dist/grails-core-0.5.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/dist/grails-crud-0.4.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/dist/grails-crud-0.5.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/dist/grails-gorm-0.4.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/dist/grails-gorm-0.5.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/dist/grails-web-0.4.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/dist/grails-web-0.5.jar" /> <classpathentry kind="output" path="web-app/WEB-INF/classes"/> racetrack_ch6/.classpath @@ -1,4 +1,4 @@ -#Do not edit app.grails.* properties, they may change automatically. DO NOT put application configuration in here, it is not the right place! -#Sun Mar 11 15:49:46 EDT 2007 -app.grails.version=0.4.2 +#Wed May 02 20:22:50 EDT 2007 +app.version=0.1 +app.grails.version=0.5 app.name=racetrack racetrack_ch6/application.properties @@ -1,11 +1,12 @@ -class ApplicationBootStrap { - def init = { servletContext -> +class ApplicationBootStrap { + + def init = { servletContext -> final String BACKUP_ADMIN = 'adminjoe' if (!User.findByUserId(BACKUP_ADMIN)) { new User(userId:BACKUP_ADMIN,password:'password').save() } - } - - def destroy = { - } -} + } + + def destroy = { + } +} \ No newline at end of file racetrack_ch6/grails-app/conf/ApplicationBootStrap.groovy @@ -1,8 +1,8 @@ -class DevelopmentDataSource { +class DevelopmentDataSource { boolean pooling = true String dbCreate = "update" String url = "jdbc:mysql://localhost/racetrack_dev" String driverClassName = "com.mysql.jdbc.Driver" String username = "jason" String password = "" -} +} racetrack_ch6/grails-app/conf/DevelopmentDataSource.groovy @@ -4,7 +4,28 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.rootLogger=error, stdout -# Enable this logger to log Hibernate output +# This logger is for your own application artefact logs +# Artefacts are logged by their type and optionally class name i.e: +# +# log4j.logger.grails.app.controller.HelloController=debug, stdout +# ...will control the logs from just that controller +# +# log4j.logger.grails.app.domain=trace, stdout +# ...will control the logs for all domain classes +# +# At the time of writing, supported artefact type ids include: +# domain (aka Domain Class), task (aka Job), service, dataSource, +# controller, tagLib, urlMappings, codec, bootstrap +# +# The default "info" level for all artefacts is set here +log4j.logger.grails.app=info,stdout +log4j.additivity.grails.app=false + +## This logger is for Grails' public APIs within the grails. package +log4j.logger.grails=info,stdout +log4j.additivity.grails=false + +## Enable this logger to log Hibernate output # handy to see its database interaction activity #log4j.logger.org.hibernate=debug,stdout #log4j.additivity.org.hibernate=false @@ -37,7 +58,3 @@ log4j.logger.org.codehaus.groovy.grails.plugins=info,stdout log4j.additivity.org.codehaus.groovy.grails.plugins=false log4j.logger.grails.spring=info,stdout log4j.additivity.grails.spring=false - -# This logger is for Grails' public APIs within the grails. package -log4j.logger.grails=info,stdout -log4j.additivity.grails=false racetrack_ch6/grails-app/conf/log4j.development.properties @@ -4,7 +4,28 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.rootLogger=error, stdout -# Enable this logger to log Hibernate output +# This logger is for your own application artefact logs +# Artefacts are logged by their type and optionally class name i.e: +# +# log4j.logger.grails.app.controller.HelloController=debug, stdout +# ...will control the logs from just that controller +# +# log4j.logger.grails.app.domain=trace, stdout +# ...will control the logs for all domain classes +# +# At the time of writing, supported artefact type ids include: +# domain (aka Domain Class), task (aka Job), service, dataSource, +# controller, tagLib, urlMappings, codec, bootstrap +# +# The default "info" level for all artefacts is set here +log4j.logger.grails.app=info,stdout +log4j.additivity.grails.app=false + +## This logger is for Grails' public APIs within the grails. package +log4j.logger.grails=info,stdout +log4j.additivity.grails=false + +## Enable this logger to log Hibernate output # handy to see its database interaction activity #log4j.logger.org.hibernate=debug,stdout #log4j.additivity.org.hibernate=false @@ -37,7 +58,3 @@ log4j.logger.org.codehaus.groovy.grails.plugins=info,stdout log4j.additivity.org.codehaus.groovy.grails.plugins=false log4j.logger.grails.spring=info,stdout log4j.additivity.grails.spring=false - -# This logger is for Grails' public APIs within the grails. package -log4j.logger.grails=info,stdout -log4j.additivity.grails=false racetrack_ch6/grails-app/conf/log4j.production.properties @@ -4,7 +4,28 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.rootLogger=error, stdout -# Enable this logger to log Hibernate output +# This logger is for your own application artefact logs +# Artefacts are logged by their type and optionally class name i.e: +# +# log4j.logger.grails.app.controller.HelloController=debug, stdout +# ...will control the logs from just that controller +# +# log4j.logger.grails.app.domain=trace, stdout +# ...will control the logs for all domain classes +# +# At the time of writing, supported artefact type ids include: +# domain (aka Domain Class), task (aka Job), service, dataSource, +# controller, tagLib, urlMappings, codec, bootstrap +# +# The default "info" level for all artefacts is set here +log4j.logger.grails.app=info,stdout +log4j.additivity.grails.app=false + +## This logger is for Grails' public APIs within the grails. package +log4j.logger.grails=info,stdout +log4j.additivity.grails=false + +## Enable this logger to log Hibernate output # handy to see its database interaction activity #log4j.logger.org.hibernate=debug,stdout #log4j.additivity.org.hibernate=false @@ -37,7 +58,3 @@ log4j.logger.org.codehaus.groovy.grails.plugins=info,stdout log4j.additivity.org.codehaus.groovy.grails.plugins=false log4j.logger.grails.spring=info,stdout log4j.additivity.grails.spring=false - -# This logger is for Grails' public APIs within the grails. package -log4j.logger.grails=info,stdout -log4j.additivity.grails=false racetrack_ch6/grails-app/conf/log4j.test.properties @@ -2,11 +2,13 @@ abstract class BaseController { def auth() { if(!session.userId) { def originalRequestParams = [controller:controllerName, action:actionName] + originalRequestParams.putAll(params) + session.originalRequestParams = originalRequestParams redirect(controller:'user',action:'login') return false } - } -} \ No newline at end of file + } +} \ No newline at end of file racetrack_ch6/grails-app/controllers/BaseController.groovy @@ -1,6 +1,6 @@ -class RaceController extends BaseController { - def beforeInterceptor = [action:this.&auth, except:['search']] +class RaceController extends BaseController { + def beforeInterceptor = [action:this.&auth, except:['search']] def index = { redirect(action:list,params:params) } @@ -48,8 +48,8 @@ class RaceController extends BaseController { def race = Race.get( params.id ) if(race) { race.properties = params - if(race.save()) { - flash.message = "${params.name} updated." + if(race.save()) { + flash.message = "${params.name} updated." redirect(action:show,id:race.id) } else { @@ -72,7 +72,7 @@ class RaceController extends BaseController { def race = new Race() race.properties = params if(race.save()) { - flash.message = "${params.name} saved." + flash.message = "${params.name} saved." redirect(action:show,id:race.id) } else { @@ -80,42 +80,41 @@ class RaceController extends BaseController { } } - def search = { - if (request.method == 'POST') { - RaceQuery query = new RaceQuery() - bindData(query, params) - - def criteria = Race.createCriteria() - - def results = criteria { - and { - like('city', '%' + query.city + '%') - like('state', '%' + query.state + '%') - if (query.distance) { - switch (query.distanceOperator) { - case RaceQuery.DistanceOperator.AT_LEAST: - ge('distance', query.distance) - break - case RaceQuery.DistanceOperator.EXACTLY: - eq('distance', query.distance) - break - case RaceQuery.DistanceOperator.AT_MOST: - le('distance', query.distance) - break - default: - log.error "Found unexpected value for distance" - + " operator - ${query.distanceOperator}" - } - } - // Add 1 day (24 hours) to the max date. (If user selects a max - // date of Jan 1st, the date object will hold Jan 1st 00:00, but - // the user will want any events occurring thru Jan 1st 23:59.) - between('startDateTime', query.minDate, query.maxDate + 1) - } - } - - render(view:'searchresults', model:[ raceList: results ]) - } - } - + def search = { + if (request.method == 'POST') { + RaceQuery query = new RaceQuery() + bindData(query, params) + + def criteria = Race.createCriteria() + + def results = criteria { + and { + like('city', '%' + query.city + '%') + like('state', '%' + query.state + '%') + if (query.distance) { + switch (query.distanceOperator) { + case RaceQuery.DistanceOperator.AT_LEAST: + ge('distance', query.distance) + break + case RaceQuery.DistanceOperator.EXACTLY: + eq('distance', query.distance) + break + case RaceQuery.DistanceOperator.AT_MOST: + le('distance', query.distance) + break + default: + log.error "Found unexpected value for distance" + + " operator - ${query.distanceOperator}" + } + } + // Add 1 day (24 hours) to the max date. If user selects a max + // date of Jan 1st, the date object will hold Jan 1st 00:00, but + // the user will want any events occurring thru Jan 1st 23:59. + between('startDateTime', query.minDate, query.maxDate + 1) + } + } + + render(view:'searchresults', model:[ raceList: results.adaptee ]) + } + } } \ No newline at end of file racetrack_ch6/grails-app/controllers/RaceController.groovy @@ -1,6 +1,6 @@ -class RegistrationController extends BaseController { - def beforeInterceptor = [action:this.&auth, except:'register'] +class RegistrationController extends BaseController { + def beforeInterceptor = [action:this.&auth, except:'register'] def index = { redirect(action:list,params:params) } @@ -49,7 +49,7 @@ class RegistrationController extends BaseController { if(registration) { registration.properties = params if(registration.save()) { - flash.message = "${params.name} updated." + flash.message = "${params.name} updated." redirect(action:show,id:registration.id) } else { @@ -72,7 +72,7 @@ class RegistrationController extends BaseController { def registration = new Registration() registration.properties = params if(registration.save()) { - flash.message = "${params.name} saved." + flash.message = "${params.name} saved." redirect(action:show,id:registration.id) } else { @@ -80,6 +80,7 @@ class RegistrationController extends BaseController { } } + def register = { def registration = new Registration() registration.properties = params @@ -90,8 +91,7 @@ class RegistrationController extends BaseController { } else { if(registration.save()) { - flash.message = - "Successfully registered for ${registration.race.name}" + flash.message = "Successfully registered for ${registration.race.name}" redirect(controller:'race',action:'search') } else { @@ -99,5 +99,5 @@ class RegistrationController extends BaseController { return ['registration':registration,'race':race] } } - } + } } \ No newline at end of file racetrack_ch6/grails-app/controllers/RegistrationController.groovy @@ -1,7 +1,7 @@ class UserController extends BaseController { def beforeInterceptor = [action:this.&auth, except:['login', 'logout']] - + def index = { redirect(action:list,params:params) } // the delete, save and update actions only racetrack_ch6/grails-app/controllers/UserController.groovy @@ -1,4 +1,4 @@ -class Race { +class Race { String name Date startDateTime String city @@ -7,16 +7,16 @@ class Race { Float cost Integer maxRunners = 100000 - static hasMany = [registrations:Registration] + static hasMany = [registrations:Registration] static constraints = { - name(maxLength:50,blank:false) - startDateTime(validator: {return (it > new Date())}) - city(maxLength:30,blank:false) + name(maxSize:50,blank:false) + startDateTime(validator: {return (it > new Date())}) + city(maxSize:30,blank:false) state(inList:['GA', 'NC', 'SC', 'VA'],blank:false) distance(min:3.1f,max:100f) cost(min:0f,max:999.99f) - } + } - String toString() {"${this.name} : ${this.city}, ${this.state}"} -} \ No newline at end of file + String toString() {"${this.name} : ${this.city}, ${this.state}" } +} racetrack_ch6/grails-app/domain/Race.groovy @@ -1,4 +1,4 @@ -class Registration { +class Registration { Race race String name Date dateOfBirth @@ -6,19 +6,17 @@ class Registration { String postalAddress String emailAddress Date createdAt = new Date() - + static belongsTo = Race - - static optionals = ["postalAddress" ] - + static constraints = { - name(maxLength:50,blank:false) + name(maxSize:50,blank:false) dateOfBirth(nullable:false) gender(inList:["M", "F"]) - postalAddress(maxLength:255) - emailAddress(maxLength:50,email:true) + postalAddress(nullable:true,maxSize:255) + emailAddress(maxSize:50,email:true) race(nullable:false) } - - String toString() {"${this.name} : ${this.emailAddress}"} -} \ No newline at end of file + + String toString(){"${this.name}:${this.emailAddress}"} +} racetrack_ch6/grails-app/domain/Registration.groovy @@ -3,7 +3,7 @@ class User { String password static constraints = { - userId(length:6..8,unique:true) - password(length:6..8) + userId(size:6..8,unique:true) + password(size:6..8) } } \ No newline at end of file racetrack_ch6/grails-app/domain/User.groovy @@ -1,29 +1,28 @@ default.doesnt.match.message=Property [{0}] of class [{1}] with value [{2}] does not match the required pattern [{3}] default.invalid.url.message=Property [{0}] of class [{1}] with value [{2}] is not a valid URL default.invalid.creditCard.message=Property [{0}] of class [{1}] with value [{2}] is not a valid credit card number -default.invalid.email.message=Property [{0}] of class [{1}] with value [{2}] is not a valid e-mail address. -default.invalid.message=Property [{0}] of class [{1}] is not a valid [{2}]. +default.invalid.email.message=Property [{0}] of class [{1}] with value [{2}] is not a valid e-mail address default.invalid.range.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid range from [{3}] to [{4}] default.invalid.size.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid size range from [{3}] to [{4}] -default.invalid.length.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid size range from [{3}] to [{4}] -default.invalid.min.message=Property [{0}] of class [{1}] with value [{2}] is less than minimum value [{3}] default.invalid.max.message=Property [{0}] of class [{1}] with value [{2}] exceeds maximum value [{3}] -default.invalid.max.length.message=Property [{0}] of class [{1}] with value [{2}] exceeds the maximum size of [{3}] -default.invalid.min.length.message=Property [{0}] of class [{1}] with value [{2}] is less than the minimum size of [{3}] +default.invalid.min.message=Property [{0}] of class [{1}] with value [{2}] is less than minimum value [{3}] default.invalid.max.size.message=Property [{0}] of class [{1}] with value [{2}] exceeds the maximum size of [{3}] default.invalid.min.size.message=Property [{0}] of class [{1}] with value [{2}] is less than the minimum size of [{3}] +default.invalid.validator.message=Property [{0}] of class [{1}] with value [{2}] does not pass custom validation default.not.inlist.message=Property [{0}] of class [{1}] with value [{2}] is not contained within the list [{3}] default.blank.message=Property [{0}] of class [{1}] cannot be blank default.not.equal.message=Property [{0}] of class [{1}] with value [{2}] cannot equal [{3}] default.null.message=Property [{0}] of class [{1}] cannot be null default.not.unique.message=Property [{0}] of class [{1}] with value [{2}] must be unique -default.not.editable.message=Property [{0}] of class [{1}] with value [{2}] cannot be changed from [{3}] -race.name.blank=Please enter a name for this race +default.paginate.prev=Previous +default.paginate.next=Next + +race.name.blank=Please enter a name for this race race.distance.max.exceeded=Please enter a valid distance no more than {3} miles race.startDateTime.validator.invalid=Please enter a future date and time race.city.blank=Please enter a city for this race -race.city.maxLength.exceeded=Please limit the city name to a maximum length of {3} characters +race.city.maxSize.exceeded=Please limit the city name to a maximum length of {3} characters race.distance.nullable=Please enter a valid distance race.distance.min.notmet=Please enter a valid distance no fewer than {3} miles race.distance.max.exceeded=Please enter a valid distance no more than {3} miles @@ -32,8 +31,8 @@ race.cost.min.notmet=Please enter a valid cost of at least ${3} race.cost.max.exceeded=Please enter a valid cost no more than ${3} registration.name.blank=Please enter a name -registration.name.maxLength.exceeded=Please limit the name to a maximum length of {3} characters -registration.postalAddress.maxLength.exceeded=Please limit the postal address to a maximum length of {3} characters +registration.name.maxSize.exceeded=Please limit the name to a maximum length of {3} characters +registration.postalAddress.maxSize.exceeded=Please limit the postal address to a maximum length of {3} characters registration.emailAddress.blank=Please enter an e-mail address -registration.emailAddress.maxLength.exceeded=Please limit the e-mail address to a maximum length of {3} characters +registration.emailAddress.maxSize.exceeded=Please limit the e-mail address to a maximum length of {3} characters registration.emailAddress.email.invalid=Please enter a valid e-mail address \ No newline at end of file racetrack_ch6/grails-app/i18n/messages.properties @@ -1,18 +1,22 @@ <g:if test="${!session.userId}"> <span class="menuButton"> - <g:link controller="user" action="login">Log in</g:link> + <g:link controller="user" action="login">Log +in</g:link> </span> </g:if> <g:else> <span class="menuButton"> <g:link controller="race" action="list"> - Manage Races & Registrations + Manage Races &amp; Registrations </g:link> </span> <span class="menuButton"> - <g:link controller="user" action="list">Manage Administrators</g:link> + <g:link controller="user" action="list">Manage Administrators + </g:link> </span> <span class="menuButton"> - <g:link controller="user" action="logout">Log out</g:link> + <g:link controller="user" action="logout"> + Log out + </g:link> </span> </g:else> racetrack_ch6/grails-app/views/_adminmenubar.gsp @@ -16,4 +16,4 @@ </tr> </table> </body> -</html> +</html> \ No newline at end of file racetrack_ch6/grails-app/views/layouts/public.gsp @@ -28,19 +28,19 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='startDateTime'>Start Date Time:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'startDateTime','errors')}'><g:datePicker name='startDateTime' value="${race?.startDateTime}"></g:datePicker></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='state'>State:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'state','errors')}'><g:select name='state' from='${race.constraints.state.inList.collect{it.encodeAsHTML()}}' value="${race.state?.encodeAsHTML()}"></g:select></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}" /></td></tr> </tbody> </table> racetrack_ch6/grails-app/views/race/create.gsp @@ -31,19 +31,19 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='startDateTime'>Start Date Time:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'startDateTime','errors')}'><g:datePicker name='startDateTime' value="${race?.startDateTime}"></g:datePicker></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='state'>State:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'state','errors')}'><g:select name='state' from='${race.constraints.state.inList.collect{it.encodeAsHTML()}}' value="${race.state?.encodeAsHTML()}"></g:select></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}" /></td></tr> <tr class='prop'><td valign='top' class='name'><label for='registrations'>Registrations:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'registrations','errors')}'><ul> <g:each var='r' in='${race?.registrations?}'> racetrack_ch6/grails-app/views/race/edit.gsp @@ -10,7 +10,7 @@ <span class="menuButton"><a href="${createLinkTo(dir:'')}">Home</a></span> <span class="menuButton"><g:link action="create">New Race</g:link></span> <span class="menuButton"> - <g:link action="search">Search for Races</g:link> + <g:link action="search">Search for Races</g:link> </span> <g:render template="/adminmenubar" /> </div> @@ -24,17 +24,17 @@ <table> <thead> <tr> - <th>Name</th> - - <th>Start Date Time</th> - - <th>City</th> - - <th>State</th> - - <th>Distance</th> - - <th></th> + <g:sortableColumn property="name" title="Name" /> + + <g:sortableColumn property="startDateTime" title="Start Date Time" /> + + <g:sortableColumn property="city" title="City" /> + + <g:sortableColumn property="state" title="State" /> + + <g:sortableColumn property="distance" title="Distance" /> + + <th></th> </tr> </thead> <tbody> racetrack_ch6/grails-app/views/race/list.gsp @@ -1,14 +1,15 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <meta http-equiv="Content-Type" content="text/html; + charset=UTF-8"/> <meta name="layout" content="public" /> <title>Search for Races</title> </head> <body> - <div class="nav"> - <g:render template="/adminmenubar" /> - </div> - <div class="body"> + <div class="nav"> + <g:render template="/adminmenubar" /> + </div> + <div class="body"> <h1>Search for Races</h1> <g:if test="${flash.message}"> <div class="message">${flash.message}</div> @@ -30,34 +31,37 @@ <label for='state'>State:</label> </td> <td valign='top' class='value'> - <g:select name='state' from='${[""] + new Race().constraints.state.inList}'> + <g:select name='state' + from='${[""] + new Race().constraints.state.inList}'> </g:select> </td> </tr> - <tr class='prop'> - <td valign='top' class='name'> - <label for='date'>Date:</label> - </td> - <td valign='top' class='value'> - between - <g:datePicker name='minDate' precision='day' /> - and - <g:datePicker name='maxDate' precision='day' value='${new Date().plus(365*2)}'/> - </td> - </tr> - <tr class='prop'> - <td valign='top' class='name'> - <label for='distance'>Distance:</label> - </td> - <td valign='top' class='value'> - <select name='distanceOperator' > - <option value='AT_LEAST' >At least</option> - <option value='EXACTLY' >Exactly</option> - <option value='AT_MOST' >At most</option> - </select> - <input type='text' name='distance' size='5'></input> mi - </td> - </tr> + <tr class='prop'> + <td valign='top' class='name'> + <label for='date'>Date:</label> + </td> + <td valign='top' class='value'> + between + <g:datePicker name='minDate' precision='day' /> + and + <g:datePicker name='maxDate' precision='day' + value='${new Date().plus(365*2)}'/> + </td> + </tr> + <tr class='prop'> + <td valign='top' class='name'> + <label for='distance'>Distance:</label> + </td> + <td valign='top' class='value'> + <select name='distanceOperator' > + <option value='AT_LEAST' >At least</option> + <option value='EXACTLY' >Exactly</option> + <option value='AT_MOST' >At most</option> + </select> + <input type='text' name='distance' size='5'> + </input> mi + </td> + </tr> </table> </div> <div class="buttons"> racetrack_ch6/grails-app/views/race/search.gsp @@ -84,4 +84,4 @@ </div> </div> </body> -</html> \ No newline at end of file +</html> racetrack_ch6/grails-app/views/race/searchresults.gsp @@ -1,7 +1,7 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <g:javascript library="racetrack" /> <meta name="layout" content="main" /> <title>Show Race</title> racetrack_ch6/grails-app/views/race/show.gsp @@ -25,10 +25,7 @@ <div class="dialog"> <table> <tbody> - - - - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='dateOfBirth'>Date Of Birth:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'dateOfBirth','errors')}'><g:datePicker name='dateOfBirth' value="${registration?.dateOfBirth}" precision='day'></g:datePicker></td></tr> @@ -36,12 +33,10 @@ <tr class='prop'><td valign='top' class='name'><label for='postalAddress'>Postal Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'postalAddress','errors')}'><textarea rows='5' cols='40' name='postalAddress'>${registration?.postalAddress?.encodeAsHTML()}</textarea></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='race'>Race:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'race','errors')}'><g:select optionKey="id" from="${Race.list()}" name='race.id' value="${registration?.race?.id}"></g:select></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='createdAt'>Created At:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'createdAt','errors')}'><g:datePicker name='createdAt' value="${registration?.createdAt}"></g:datePicker></td></tr> - </tbody> </table> </div> racetrack_ch6/grails-app/views/registration/create.gsp @@ -31,7 +31,7 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='dateOfBirth'>Date Of Birth:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'dateOfBirth','errors')}'><g:datePicker name='dateOfBirth' value="${registration?.dateOfBirth}" precision='day'></g:datePicker></td></tr> @@ -39,7 +39,7 @@ <tr class='prop'><td valign='top' class='name'><label for='postalAddress'>Postal Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'postalAddress','errors')}'><textarea rows='5' cols='40' name='postalAddress'>${registration?.postalAddress?.encodeAsHTML()}</textarea></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='race'>Race:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'race','errors')}'><g:select optionKey="id" from="${Race.list()}" name='race.id' value="${registration?.race?.id}"></g:select></td></tr> @@ -51,7 +51,7 @@ <div class="buttons"> <span class="button"><g:actionSubmit value="Update" /></span> - <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRaceDelete();"/></span> + <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRegistrationDelete();" /></span> </div> </g:form> </div> racetrack_ch6/grails-app/views/registration/edit.gsp @@ -21,17 +21,17 @@ <table> <thead> <tr> - <th>Name</th> - - <th>Date Of Birth</th> - - <th>Gender</th> - - <th>Postal Address</th> - - <th>Email Address</th> - - <th></th> + <g:sortableColumn property="name" title="Name" /> + + <g:sortableColumn property="dateOfBirth" title="Date Of Birth" /> + + <g:sortableColumn property="gender" title="Gender" /> + + <g:sortableColumn property="postalAddress" title="Postal Address" /> + + <g:sortableColumn property="emailAddress" title="Email Address" /> + + <th></th> </tr> </thead> <tbody> racetrack_ch6/grails-app/views/registration/list.gsp @@ -5,10 +5,10 @@ <title>Register</title> </head> <body> + <div class="body"> <div class="nav"> <g:render template="/adminmenubar" /> </div> - <div class="body"> <h1>Register for ${race.name} </h1> <em>Start Date: <g:formatDate date="${race.startDateTime}" format="EEE, MMM d, yyyy"/> @@ -89,4 +89,4 @@ </g:form> </div> </body> -</html> \ No newline at end of file +</html> racetrack_ch6/grails-app/views/registration/register.gsp @@ -78,7 +78,7 @@ <g:form controller="registration"> <input type="hidden" name="id" value="${registration?.id}" /> <span class="button"><g:actionSubmit value="Edit" /></span> - <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRaceDelete();"/></span> + <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRegistrationDelete();" /></span> </g:form> </div> </div> racetrack_ch6/grails-app/views/registration/show.gsp @@ -9,6 +9,7 @@ <div class="nav"> <span class="menuButton"><a href="${createLinkTo(dir:'')}">Home</a></span> <span class="menuButton"><g:link action="list">User List</g:link></span> + <g:render template="/adminmenubar" /> </div> <div class="body"> <h1>Create User</h1> @@ -27,9 +28,9 @@ - <tr class='prop'><td valign='top' class='name'><label for='userId'>User Id:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'userId','errors')}'><input type="text" maxlength='8' name='userId' value="${user?.userId?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='userId'>User Id:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'userId','errors')}'><input type="text" maxlength='8' name='userId' value="${user?.userId?.encodeAsHTML()}"/></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='password'>Password:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'password','errors')}'><input type="text" maxlength='8' name='password' value="${user?.password?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='password'>Password:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'password','errors')}'><input type="text" maxlength='8' name='password' value="${user?.password?.encodeAsHTML()}"/></td></tr> </tbody> </table> racetrack_ch6/grails-app/views/user/create.gsp @@ -10,6 +10,7 @@ <span class="menuButton"><a href="${createLinkTo(dir:'')}">Home</a></span> <span class="menuButton"><g:link action="list">User List</g:link></span> <span class="menuButton"><g:link action="create">New User</g:link></span> + <g:render template="/adminmenubar" /> </div> <div class="body"> <h1>Edit User</h1> @@ -33,9 +34,9 @@ - <tr class='prop'><td valign='top' class='name'><label for='userId'>User Id:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'userId','errors')}'><input type="text" maxlength='8' name='userId' value="${user?.userId?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='userId'>User Id:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'userId','errors')}'><input type="text" maxlength='8' name='userId' value="${user?.userId?.encodeAsHTML()}"/></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='password'>Password:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'password','errors')}'><input type="text" maxlength='8' name='password' value="${user?.password?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='password'>Password:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'password','errors')}'><input type="text" maxlength='8' name='password' value="${user?.password?.encodeAsHTML()}"/></td></tr> </tbody> </table> racetrack_ch6/grails-app/views/user/edit.gsp @@ -9,6 +9,7 @@ <div class="nav"> <span class="menuButton"><a href="${createLinkTo(dir:'')}">Home</a></span> <span class="menuButton"><g:link action="create">New User</g:link></span> + <g:render template="/adminmenubar" /> </div> <div class="body"> <h1>User List</h1> @@ -20,15 +21,14 @@ <table> <thead> <tr> - - - <th>Id</th> - - <th>User Id</th> - - <th>Password</th> - - <th></th> + + <g:sortableColumn property="id" title="Id" /> + + <g:sortableColumn property="userId" title="User Id" /> + + <g:sortableColumn property="password" title="Password" /> + + <th></th> </tr> </thead> <tbody> racetrack_ch6/grails-app/views/user/list.gsp @@ -44,4 +44,4 @@ </g:form> </div> </body> -</html> +</html> \ No newline at end of file racetrack_ch6/grails-app/views/user/login.gsp @@ -10,6 +10,7 @@ <span class="menuButton"><a href="${createLinkTo(dir:'')}">Home</a></span> <span class="menuButton"><g:link action="list">User List</g:link></span> <span class="menuButton"><g:link action="create">New User</g:link></span> + <g:render template="/adminmenubar" /> </div> <div class="body"> <h1>Show User</h1> racetrack_ch6/grails-app/views/user/show.gsp @@ -25,7 +25,10 @@ import org.springframework.context.NoSuchMessageException; import org.springframework.web.servlet.support.RequestContextUtils as RCU; import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU; -class ApplicationTagLib { +class ApplicationTagLib { + + def grailsUrlMappingsHolder + /** * Creates a link to a resource, generally used as a method rather than a tag. * @@ -33,7 +36,7 @@ class ApplicationTagLib { */ def createLinkTo = { attrs -> out << grailsAttributes.getApplicationUri(request) - if(attrs['dir']) { + if(attrs['dir'] || attrs['dir'] == '') { out << "/${attrs['dir']}" } if(attrs['file']) { @@ -50,7 +53,7 @@ class ApplicationTagLib { def link = { attrs, body -> out << "<a href=\"" // create the link - createLink(attrs) + out << createLink(attrs) out << '\" ' // process remaining attributes @@ -59,7 +62,7 @@ class ApplicationTagLib { } out << ">" // output the body - body() + out << body() // close tag out << "</a>" @@ -79,29 +82,47 @@ class ApplicationTagLib { if(attrs['url']) { attrs = attrs.remove('url') } - // if the current attribute null set the controller uri to the current controller - if(attrs["controller"]) { - out << '/' << attrs.remove("controller") - } - else { - out << grailsAttributes.getControllerUri(request) - } - if(attrs["action"]) { - out << '/' << attrs.remove("action") - } - if(attrs["id"]) { - out << '/' << attrs.remove("id") - } - if(attrs['params']) { - def pms = attrs.remove('params') - out << '?' - def i = 0 - pms.each { k,v -> - out << "${k.encodeAsURL()}=${v?.encodeAsURL()}" - if(++i < pms.size()) - out << '&' - } - } + + def controller = attrs.containsKey("controller") ? attrs.remove("controller") : grailsAttributes.getController(request).controllerName + def action = attrs.remove("action") + def id = attrs.remove("id") + def params = attrs.params ? attrs.remove('params') : [:] + + def url + try { + if(id) params.id = id + def mapping = grailsUrlMappingsHolder?.getReverseMapping(controller,action,params) + params.controller = controller + if(action) params.action = action + url = mapping?.createURL(params) + } + finally { + params.remove('controller') + params.remove('action') + params.remove('id') + } + if(url) { + out << url + } + else { + out << '/' << controller + if(action) { + out << '/' << action + } + if(id) { + out << '/' << id + } + if(params) { + out << '?' + def i = 0 + params.each { k,v -> + out << "${k.encodeAsURL()}=${v?.encodeAsURL()}" + if(++i < params.size()) + out << '&' + } + } + } + } /** @@ -127,8 +148,8 @@ class ApplicationTagLib { } } } - out << '>' - body() + out << '>' + out << body() out << "</${attrs.name}>" } } racetrack_ch6/plugins/core/grails-app/taglib/ApplicationTagLib.groovy @@ -16,6 +16,7 @@ import org.springframework.validation.Errors; import org.springframework.context.NoSuchMessageException; import org.springframework.web.servlet.support.RequestContextUtils as RCU; import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU; +import org.codehaus.groovy.grails.commons.DomainClassArtefactHandler; /** * A tag lib that provides tags for working with form controls @@ -33,7 +34,10 @@ class FormTagLib { def textField = { attrs -> attrs.type = "text" attrs.tagName = "textField" - field(attrs) + def result = field(attrs) + if(result) { + out << result + } } /** * Creates a hidden field @@ -41,7 +45,7 @@ class FormTagLib { def hiddenField = { attrs -> attrs.type = "hidden" attrs.tagName = "hiddenField" - field(attrs) + out << field(attrs) } /** * Creates a submit button @@ -49,7 +53,7 @@ class FormTagLib { def submitButton = { attrs -> attrs.type = "submit" attrs.tagName = "submitButton" - field(attrs) + out << field(attrs) } /** * A general tag for creating fields @@ -84,7 +88,7 @@ class FormTagLib { void resolveAttributes(attrs) { if(!attrs.name && !attrs.field) { - throwTagError("Tag [$tagName] is missing required attribute [name] or [field]") + throwTagError("Tag [${attrs.tagName}] is missing required attribute [name] or [field]") } attrs.remove('tagName') @@ -121,7 +125,7 @@ class FormTagLib { def form = { attrs, body -> out << "<form action=\"" // create the link - createLink(attrs) + out << createLink(attrs) out << '\" ' // default to post @@ -133,26 +137,34 @@ class FormTagLib { out << ">" // output the body - body() + def bodyContent = body() + out << bodyContent // close tag out << "</form>" } /** * Creates a submit button that submits to an action in the controller specified by the form action - * The value of the action attribute is translated into the action name, for example "Edit" becomes - * "edit" or "List People" becomes "listPeople" + * The name of the action attribute is translated into the action name, for example "Edit" becomes + * "_action_edit" or "List People" becomes "_action_listPeople" + * If the action attribute is not specified, the value attribute will be used as part of the action name * * <g:actionSubmit value="Edit" /> + * <g:actionSubmit action="Edit" value="Some label for editing" /> * */ def actionSubmit = { attrs -> - out << '<input type="submit" name="_action" ' - def value = attrs.remove('value') - if(value) { - out << "value=\"${value}\" " + if(!attrs.value) { + throwTagError("Tag [$tagName] is missing required attribute [value]") } - // process remaining attributes + + // add action and value + def value = attrs.remove('value') + def action = attrs.action ? attrs.remove('action') : value + + out << "<input type=\"submit\" name=\"_action_${action}\" value=\"${value}\" " + + // process remaining attributes outputAttributes(attrs) // close tag @@ -161,22 +173,30 @@ class FormTagLib { } /** * Creates a an image submit button that submits to an action in the controller specified by the form action - * The value of the action attribute is translated into the action name, for example "Edit" becomes - * "edit" or "List People" becomes "listPeople" + * The name of the action attribute is translated into the action name, for example "Edit" becomes + * "_action_edit" or "List People" becomes "_action_listPeople" + * If the action attribute is not specified, the value attribute will be used as part of the action name * * <g:actionSubmitImage src="/images/submitButton.gif" action="Edit" /> * */ def actionSubmitImage = { attrs -> - out << '<input type="image" name="_action" ' - def value = attrs.remove('value') - if(value) { - out << "value=\"${value}\" " + if(!attrs.value) { + throwTagError("Tag [$tagName] is missing required attribute [value]") } + + // add action and value + def value = attrs.remove('value') + def action = attrs.action ? attrs.remove('action') : value + + out << "<input type=\"image\" name=\"_action_${action}\" value=\"${value}\" " + + // add image src def src = attrs.remove('src') if(src) { out << "src=\"${src}\" " } + // process remaining attributes outputAttributes(attrs) @@ -201,6 +221,8 @@ class FormTagLib { def value = (attrs['value'] ? attrs['value'] : xdefault) def name = attrs['name'] + def id = attrs['id'] ? attrs['id'] : name + def noSelection = attrs['noSelection'] if (noSelection != null) { @@ -253,7 +275,7 @@ class FormTagLib { // create day select if (precision >= PRECISION_RANKINGS["day"]) { - out.println "<select name=\"${name}_day\">" + out.println "<select name=\"${name}_day\" id=\"${id}_day\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -272,7 +294,7 @@ class FormTagLib { // create month select if (precision >= PRECISION_RANKINGS["month"]) { - out.println "<select name=\"${name}_month\">" + out.println "<select name=\"${name}_month\" id=\"${id}_month\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -294,7 +316,7 @@ class FormTagLib { // create year select if (precision >= PRECISION_RANKINGS["year"]) { - out.println "<select name=\"${name}_year\">" + out.println "<select name=\"${name}_year\" id=\"${id}_year\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -313,7 +335,7 @@ class FormTagLib { // do hour select if (precision >= PRECISION_RANKINGS["hour"]) { - out.println "<select name=\"${name}_hour\">" + out.println "<select name=\"${name}_hour\" id=\"${id}_hour\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -338,7 +360,7 @@ class FormTagLib { // do minute select if (precision >= PRECISION_RANKINGS["minute"]) { - out.println "<select name=\"${name}_minute\">" + out.println "<select name=\"${name}_minute\" id=\"${id}_minute\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -360,7 +382,7 @@ class FormTagLib { def renderNoSelectionOption = { noSelectionKey, noSelectionValue, value -> // If a label for the '--Please choose--' first item is supplied, write it out out << '<option value="' << (noSelectionKey == null ? "" : noSelectionKey) << '"' - if(noSelectionKey == value) { + if(noSelectionKey.equals(value)) { out << ' selected="selected" ' } out << '>' << noSelectionValue.encodeAsHTML() << '</option>' @@ -388,7 +410,7 @@ class FormTagLib { } // use generic select - select( attrs ) + out << select( attrs ) } /** @@ -405,7 +427,7 @@ class FormTagLib { attrs['optionValue'] = { "${it.language}, ${it.country}, ${it.displayName}" } // use generic select - select( attrs ) + out << select( attrs ) } /** @@ -425,7 +447,7 @@ class FormTagLib { attrs.value = null } // invoke generic select - select( attrs ) + out << select( attrs ) } /** @@ -436,11 +458,15 @@ class FormTagLib { * <g:select name="user.company.id" from="${Company.list()}" value="${user?.company.id}" optionKey="id" /> */ def select = { attrs -> + def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource") + def locale = RCU.getLocale(request) + def from = attrs.remove('from') def keys = attrs.remove('keys') def optionKey = attrs.remove('optionKey') def optionValue = attrs.remove('optionValue') def value = attrs.remove('value') + def valueMessagePrefix = attrs.remove('valueMessagePrefix') def noSelection = attrs.remove('noSelection') if (noSelection != null) { noSelection = noSelection.entrySet().iterator().next() @@ -461,20 +487,21 @@ class FormTagLib { // create options from list if(from) { from.eachWithIndex { el,i -> + def keyValue = null out << '<option ' if(keys) { - out << 'value="' << keys[i] << '" ' - if(keys[i] == value) { + keyValue = keys[i] + out << 'value="' << keyValue << '" ' + if(keyValue == value) { out << 'selected="selected" ' } } - else if(optionKey) { - def keyValue = null + else if(optionKey) { if(optionKey instanceof Closure) { keyValue = optionKey(el) - out << 'value="' << keyValue << '" ' + out << 'value="' << keyValue << '" ' } - else if(el !=null && optionKey == 'id' && grailsApplication.getGrailsDomainClass(el.getClass().name)) { + else if(el !=null && optionKey == 'id' && grailsApplication.getArtefact(DomainClassArtefactHandler.TYPE, el.getClass().name)) { keyValue = el.ident() out << 'value="' << keyValue << '" ' } @@ -488,8 +515,9 @@ class FormTagLib { } } else { - out << "value=\"${el}\" " - if(el == value) { + keyValue = el + out << "value=\"${keyValue}\" " + if(keyValue == value) { out << 'selected="selected" ' } } @@ -502,6 +530,19 @@ class FormTagLib { out << el.properties[optionValue].toString().encodeAsHTML() } } + else if(valueMessagePrefix) { + def message = messageSource.getMessage("${valueMessagePrefix}.${keyValue}", null, null, locale) + if(message) { + out << message.encodeAsHTML() + } + else if (keyValue) { + out << keyValue.encodeAsHTML() + } + else { + def s = el.toString() + if(s) out << s.encodeAsHTML() + } + } else { def s = el.toString() if(s) out << s.encodeAsHTML() @@ -554,6 +595,6 @@ class FormTagLib { outputAttributes(attrs) // close the tag, with no body - out << ' ></input>' + out << ' />' } } \ No newline at end of file racetrack_ch6/plugins/core/grails-app/taglib/FormTagLib.groovy @@ -95,7 +95,7 @@ class JavascriptTagLib { } else { out.println '<script type="text/javascript">' - body() + out << body() out.println '</script>' } } @@ -137,15 +137,15 @@ class JavascriptTagLib { /** * A link to a remote uri that used the prototype library to invoke the link via ajax */ - def remoteLink = { attrs, body -> + def remoteLink = { attrs, body -> out << "<a href=\"" def cloned = deepClone(attrs) - createLink(cloned) + out << createLink(cloned) out << "\" onclick=\"" // create remote function - remoteFunction(attrs) + out << remoteFunction(attrs) attrs.remove('url') out << "return false;\" " // process remaining attributes @@ -154,7 +154,7 @@ class JavascriptTagLib { } out << ">" // output the body - body() + out << body() // close tag out << "</a>" @@ -180,7 +180,7 @@ class JavascriptTagLib { else { attrs.params = "'${paramName}='+this.value" } - remoteFunction(attrs) + out << remoteFunction(attrs) attrs.remove('params') out << "\"" attrs.remove('url') @@ -208,16 +208,16 @@ class JavascriptTagLib { // prepare form settings prepareAjaxForm(p,attrs) - def params = [ onsubmit:TagLibUtil.outToString(remoteFunction,attrs) + 'return false', + def params = [ onsubmit:remoteFunction(attrs) + 'return false', method: (attrs.method? attrs.method : 'POST' ), - action: (attrs.action? attrs.action : TagLibUtil.outToString(createLink,url)) + action: (attrs.action? attrs.action : createLink(url)) ] attrs.remove('url') params.putAll(attrs) if(params.name && !params.id) params.id = params.name - withTag(name:'form',attrs:params) { - body() + out << withTag(name:'form',attrs:params) { + out << body() } } @@ -230,7 +230,7 @@ class JavascriptTagLib { // prepare form settings attrs.forSubmitTag = ".form" prepareAjaxForm(p,attrs) - def params = [ onclick:TagLibUtil.outToString(remoteFunction,attrs) + 'return false', + def params = [ onclick:remoteFunction(attrs) + 'return false', type: 'button', name: attrs.remove('name'), value: attrs.remove('value'), @@ -238,8 +238,8 @@ class JavascriptTagLib { 'class':attrs.remove('class') ] - withTag(name:'input', attrs:params) { - body() + out << withTag(name:'input', attrs:params) { + out << body() } } @@ -275,7 +275,7 @@ class JavascriptTagLib { def sw = new StringWriter() out = new PrintWriter(out) // invoke body - body() + out << body() // restore out out = tmp js = sw.toString() @@ -357,10 +357,10 @@ class PrototypeProvider implements JavascriptProvider { def pms = attrs.remove('params') if(attrs.url) { - taglib.createLink(attrs.url) + out << taglib.createLink(attrs.url) } else { - taglib.createLink(attrs) + out << taglib.createLink(attrs) } @@ -415,6 +415,7 @@ class PrototypeProvider implements JavascriptProvider { case 'true': ajaxOptions << "${k}:${v}"; break; case 'false': ajaxOptions << "${k}:${v}"; break; case ~/\s*function(\w*)\s*/: ajaxOptions << "${k}:${v}"; break; + case ~/Insertion\..*/: ajaxOptions << "${k}:${v}"; break; default:ajaxOptions << "${k}:'${v}'"; break; } } @@ -441,10 +442,10 @@ class YahooProvider implements JavascriptProvider { out << "YAHOO.util.Connect.asyncRequest('${method}','" if(attrs.url) { - taglib.createLink(attrs.url) + out << taglib.createLink(attrs.url) } else { - taglib.createLink(attrs) + out << taglib.createLink(attrs) } attrs.remove('url') out << "'," @@ -504,7 +505,7 @@ class DojoProvider implements JavascriptProvider { } out << 'dojo.io.bind({url:\'' - taglib.createLink(attrs) + out << taglib.createLink(attrs) attrs.remove('params') out << '\',load:function(type,data,evt) {' if(attrs.onLoaded) { racetrack_ch6/plugins/core/grails-app/taglib/JavascriptTagLib.groovy @@ -25,6 +25,7 @@ import org.springframework.web.servlet.support.RequestContextUtils as RCU; import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU; class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants { + def out // to facilitate testing protected getPage() { return request[PAGE] @@ -91,7 +92,7 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants } } if(invokeBody) { - body(); + out << body() } } } @@ -134,54 +135,183 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants if(attrs.total == null) throwTagError("Tag [paginate] is missing required attribute [total]") - def mkp = new groovy.xml.MarkupBuilder(out) + def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource") + def locale = RCU.getLocale(request) + def total = attrs.total.toInteger() - def max = params.max?.toInteger() - def offset = params.offset?.toInteger() def action = (attrs.action? attrs.action : 'list') - def breadcrumb = true - if(attrs.breadcrumb) breadcrumb = Boolean.valueOf(attrs.breadcrumb) - + def offset = params.offset?.toInteger() + def max = params.max?.toInteger() + def maxsteps = (attrs.maxsteps ? attrs.maxsteps.toInteger() : 10) + + if(attrs.breadcrumb) { + log.warn("Tag [paginate] includes the [breadcrumb] attribute. This attribute is deprecated and will be removed in the future. Please update your code to use the [maxsteps] attribute instead.") + } + + if(!offset) offset = (attrs.offset ? attrs.offset.toInteger() : 0) if(!max) max = (attrs.max ? attrs.max.toInteger() : 10) - if(!offset) offset = (attrs.offset ? attrs.offset.toInteger() : 0) - def linkParams = [offset:offset-max,max:max] - def linkTagAttrs = ['class':'prevLink',action:action] + def linkParams = [offset:offset - max, max:max] + if(params.sort) linkParams.sort = params.sort + if(params.order) linkParams.order = params.order + if(attrs.params) linkParams.putAll(attrs.params) + + def linkTagAttrs = [action:action] if(attrs.controller) { linkTagAttrs.controller = attrs.controller } if(attrs.id) { linkTagAttrs.id = attrs.id } - if(attrs.params)linkParams.putAll(attrs.params) linkTagAttrs.params = linkParams - - def combined = max + offset - if(offset > 0) { - link(linkTagAttrs.clone(),{out<< (attrs.prev? attrs.prev : 'Previous' ) }) + + // determine paging variables + def steps = maxsteps > 0 + int currentstep = (offset / max) + 1 + int firststep = 1 + int laststep = Math.round(Math.ceil(total / max)) + + // display previous link when not on firststep + if(currentstep > firststep) { + linkTagAttrs.class = 'prevLink' + out << link(linkTagAttrs.clone()) { + (attrs.prev ? attrs.prev : messageSource.getMessage('default.paginate.prev', null, 'Previous', locale)) + } } - if(total > max) { - linkTagAttrs.'class' = 'step' - if(breadcrumb) { - def j = 0 - 0.step(total,max) { i -> - if(offset == i) { - mkp.a('class':'step',"${++j}") - } - else { - linkParams.offset=i - link(linkTagAttrs.clone(),{out<<++j}) - } - } + // display steps when steps are enabled and laststep is not firststep + if(steps && laststep > firststep) { + linkTagAttrs.class = 'step' + + // determine begin and endstep paging variables + int beginstep = currentstep - Math.round(maxsteps / 2) + (maxsteps % 2) + int endstep = currentstep + Math.round(maxsteps / 2) - 1 + + if(beginstep < firststep) { + beginstep = firststep + endstep = maxsteps + } + if(endstep > laststep) { + beginstep = laststep - maxsteps + 1 + if(beginstep < firststep) { + beginstep = firststep + } + endstep = laststep + } + + // display firststep link when beginstep is not firststep + if(beginstep > firststep) { + linkParams.offset = 0 + out << link(linkTagAttrs.clone()) {firststep.toString()} + out << '<span class="step">..</span>' + } + + // display paginate steps + (beginstep..endstep).each { i -> + if(currentstep == i) { + out << "<span class=\"currentStep\">${i}</span>" + } + else { + linkParams.offset = (i - 1) * max + out << link(linkTagAttrs.clone()) {i.toString()} + } + } + + // display laststep link when endstep is not laststep + if(endstep < laststep) { + out << '<span class="step">..</span>' + linkParams.offset = (laststep -1) * max + out << link(linkTagAttrs.clone()) { laststep.toString() } + } + } + + // display next link when not on laststep + if(currentstep < laststep) { + linkTagAttrs.class = 'nextLink' + linkParams.offset = offset + max + out << link(linkTagAttrs.clone()) { + (attrs.next ? attrs.next : messageSource.getMessage('default.paginate.next', null, 'Next', locale)) } } - linkParams.offset = offset+max - if(combined < total) { - linkTagAttrs.'class'='nextLink' - link(linkTagAttrs,{out<< (attrs.'next'? attrs.'next' : 'Next' )}) + + } + + /** + * Renders a sortable column to support sorting in list views + * + * Attributes: + * + * property - name of the property relating to the field + * defaultOrder (optional) - default order for the property; choose between asc (default if not provided) and desc + * title (optional*) - title caption for the column + * titleKey (optional*) - title key to use for the column, resolved against the message source + * params (optional) - a map containing request parameters + * + * Attribute title or titleKey is required. When both attributes are specified then titleKey takes precedence, + * resulting in the title caption to be resolved against the message source. In case when the message could + * not be resolved, the title will be used as title caption. + * + * Examples: + * + * <g:sortableColumn property="title" title="Title" /> + * <g:sortableColumn property="title" title="Title" style="width: 200px" /> + * <g:sortableColumn property="title" titleKey="book.title" /> + * <g:sortableColumn property="releaseDate" defaultOrder="desc" title="Release Date" /> + * <g:sortableColumn property="releaseDate" defaultOrder="desc" title="Release Date" titleKey="book.releaseDate" /> + */ + def sortableColumn = { attrs -> + + if(!attrs.property) + throwTagError("Tag [sortableColumn] is missing required attribute [property]") + + if(!attrs.title && !attrs.titleKey) + throwTagError("Tag [sortableColumn] is missing required attribute [title] or [titleKey]") + + def property = attrs.remove("property") + def action = attrs.action ? attrs.remove("action") : "list" + + def defaultOrder = attrs.remove("defaultOrder") + if(defaultOrder != "desc") defaultOrder = "asc" + + // current sorting property and order + def sort = params.sort + def order = params.order + + // add sorting property and params to link params + def linkParams = [sort:property] + if(attrs.params) linkParams.putAll(attrs.params) + + // determine and add sorting order for this column to link params + attrs.class = "sortable" + if(property == sort) { + attrs.class = attrs.class + " sorted " + order + if(order == "asc") { + linkParams.order = "desc" + } + else { + linkParams.order = "asc" + } + } + else { + linkParams.order = defaultOrder + } + + // determine column title + def title = attrs.remove("title") + def titleKey = attrs.remove("titleKey") + if(titleKey) { + if(!title) title = titleKey + def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource") + def locale = RCU.getLocale(request) + title = messageSource.getMessage(titleKey, null, title, locale) } + out << "<th " + // process remaining attributes + attrs.each { k, v -> + out << "${k}=\"${v.encodeAsHTML()}\" " + } + out << ">${link(action:action, params:linkParams) { title }}</th>" } /** @@ -199,14 +329,7 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants def uri = grailsAttributes.getTemplateUri(attrs.template,request) def var = attrs['var'] - def url = servletContext.getResource(uri) - if(!url) - throwTagError("No template found for name [${attrs.template}] in tag [render]") - - def t = engine.createTemplate( uri, - servletContext, - request, - response) + def t = engine.createTemplate( uri ) if(attrs.model instanceof Map) { t.make( attrs.model ).writeTo(out) @@ -246,14 +369,7 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants def engine = grailsAttributes.getPagesTemplateEngine() def uri = grailsAttributes.getTemplateUri(attrs.template,request) - def url = servletContext.getResource(uri) - if(!url) - throwTagError("No template found for name [${attrs.template}] in tag [include]") - - def t = engine.createTemplate( uri, - servletContext, - request, - response) + def t = engine.createTemplate( uri ) t.make().writeTo(out) } racetrack_ch6/plugins/core/grails-app/taglib/RenderTagLib.groovy @@ -152,7 +152,7 @@ class UITagLib { * <g:richTextEditor name="editor" height="400" /> */ def richTextEditor = { attrs -> - withTag(name:'script',attributes:[type:'text/javascript']) { + out << withTag(name:'script',attributes:[type:'text/javascript']) { if(attrs.onComplete) { out.println "function FCKeditor_OnComplete( editorInstance ) {" out.println "${attrs.onComplete}(editorInstance);" @@ -162,24 +162,53 @@ class UITagLib { var oFCKeditor = new FCKeditor( '${attrs.name}' ) ; oFCKeditor.BasePath = \"""" if(attrs.basepath) { - createLinkTo(dir:attrs.basepath) + out << createLinkTo(dir:attrs.basepath) } else { - createLinkTo(dir:"fckeditor/") + out << createLinkTo(dir:"fckeditor/") } out.println '";' if(attrs.toolbar) { out << "oFCKeditor.ToolbarSet = '${attrs.toolbar}';" - } + } + // add width support + if(attrs.width) + out.println "oFCKeditor.Width = '${attrs.width}';" + if(attrs.height) - out.println "oFCKeditor.Height = ${attrs.height};" + out.println "oFCKeditor.Height = '${attrs.height}';" + + // add skin support, values to choose: "default", "office2003", "silver" + if(attrs.skin) + out.println "oFCKeditor.Config['SkinPath'] = 'skins/${attrs.skin}/';" + + // check the browser compatibility when rendering the editor. default value: true, values to choose: true, false, + if(attrs.checkBrowser) + out.println "oFCKeditor.CheckBrowser = ${attrs.checkBrowser};" + + // show error messages on errors while rendering the editor. default value: true, values to choose: true, false + if(attrs.displayErrors) + out.println "oFCKeditor.DisplayErrors = ${attrs.displayErrors};" + + // oFCKeditor.Config AutoDetectLanguage:true/false, DefaultLanguage:'pt-BR' and so on + if(attrs.config) { + if (attrs.config instanceof Map) { + attrs.config.each { k, v -> + out.println "oFCKeditor.Config['$k'] = '$v';" + } + } else { + throw new Exception("""The format of config is not correct, it should be like "[AutoDetectLanguage:false, DefaultLanguage:'pt-BR']" """) + } + } + if(attrs.value) { out << "oFCKeditor.Value = \"" - escapeJavascript(Collections.EMPTY_MAP,attrs.value) + out << escapeJavascript(Collections.EMPTY_MAP,attrs.value) out.println "\" ;" } - out.println "oFCKeditor.Create();" + out.println "oFCKeditor.Create();" + } } } \ No newline at end of file racetrack_ch6/plugins/core/grails-app/taglib/UITagLib.groovy @@ -32,9 +32,7 @@ class ValidationTagLib { def model = attrs['model'] def checkList = [] if(model) { - checkList = model.findAll { k,v -> - return ((v.errors != null) && (v.errors instanceof Errors)) - } + checkList = model.findAll { it.value?.errors instanceof Errors }.collect { it.value } } if(attrs['bean']) { checkList << attrs['bean'] @@ -45,7 +43,7 @@ class ValidationTagLib { if(ra) { if(ra instanceof Errors) checkList << ra - else if ((ra.properties.errors) && (ra.errors instanceof Errors)) { + else if (ra.properties?.errors instanceof Errors) { checkList << ra } } @@ -55,23 +53,29 @@ class ValidationTagLib { for(i in checkList) { def errors = null - if(i instanceof Errors) { + if (i instanceof Errors) { errors = i } - else { - if ((i.errors != null) && (i.errors instanceof Errors)) { - if (i.hasErrors()) - errors = i.errors - } + else { + try { + if ((i.errors != null) && (i.errors instanceof Errors)) { + if (i.hasErrors()) + errors = i.errors + } + + } + catch(MissingPropertyException mpe) { + // ignore + } } if(errors) { if(attrs['field']) { if(errors.hasFieldErrors(attrs['field'])) { - body() + out << body() } } else { - body() + out << body() } } } @@ -84,9 +88,7 @@ class ValidationTagLib { def model = attrs['model'] def errorList = [] if(model) { - errorList = model.findAll { k,v -> - return ((v.errors != null) && (v.errors instanceof Errors)) - } + errorList = model.findAll { it.value?.errors instanceof Errors }.collect { it.value } } if(attrs['bean']) { errorList << attrs['bean'] @@ -95,9 +97,9 @@ class ValidationTagLib { request.attributeNames.each { def ra = request[it] if(ra) { - if(ra instanceof Errors) + if (ra instanceof Errors) errorList << ra - else if ((ra.errors != null) && (ra.errors instanceof Errors)) { + else if (ra.properties?.errors instanceof Errors) { errorList << ra } } @@ -119,13 +121,13 @@ class ValidationTagLib { if(attrs['field']) { if(errors.hasFieldErrors(attrs['field'])) { errors.getFieldErrors( attrs["field"] ).each { - body(it) + out << body(it) } } } else { errors.allErrors.each { - body( it ) + out << body( it ) } } } @@ -141,9 +143,9 @@ class ValidationTagLib { if(renderAs == 'list') { out << "<ul>" - eachError(attrs, { + out << eachError(attrs, { out << "<li>" - message(error:it) + out << message(error:it) out << "</li>" } ) @@ -219,7 +221,7 @@ class ValidationTagLib { } def app = grailsAttributes.getGrailsApplication() - def dc = app.getGrailsDomainClass(againstClass) + def dc = app.getDomainClass(againstClass) if(!dc) throwTagError("Tag [validate] could not find a domain class to validate against for name [${againstClass}]") racetrack_ch6/plugins/core/grails-app/taglib/ValidationTagLib.groovy @@ -8,7 +8,7 @@ class URLCodec { } static decode = { obj -> - URLEncoder.decode(obj.toString(), URLCodec.getEncoding()) + URLDecoder.decode(obj.toString(), URLCodec.getEncoding()) } private static def getEncoding() { racetrack_ch6/plugins/core/grails-app/utils/URLCodec.groovy @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> - -<beans> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> </beans> \ No newline at end of file racetrack_ch6/spring/resources.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> -<beans> <bean id="grailsApplication" class="org.codehaus.groovy.grails.commons.GrailsApplicationFactoryBean"> <description>Grails application factory bean</description> <property name="groovyFiles"> @@ -25,7 +27,7 @@ <property name="pluginManager" ref="pluginManager" /> </bean> - <bean id="grailsResourceHolder" singleton="false" class="org.codehaus.groovy.grails.commons.spring.GrailsResourceHolder"> + <bean id="grailsResourceHolder" scope="prototype" class="org.codehaus.groovy.grails.commons.spring.GrailsResourceHolder"> <property name="resources"> <value>classpath*:**/grails-app/**/*.groovy</value> </property> racetrack_ch6/web-app/WEB-INF/applicationContext.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> - -<beans> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> </beans> \ No newline at end of file racetrack_ch6/web-app/WEB-INF/spring/resources.xml @@ -10,6 +10,254 @@ <uri>http://grails.codehaus.org/tags</uri> <tag> + <description> + Enables the storing of a value into the given ${var} + </description> + <name>set</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovySetTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The value to store</description> + <name>value</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The name of the variable to store the value in</description> + <name>var</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Enables the storing of a value into the given ${var} into the page context + </description> + <name>def</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyDefTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The value to store</description> + <name>value</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The name of the variable to store the value in</description> + <name>var</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Logical if tag to test whether the given condition is true + </description> + <name>if</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyIfTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The condition to test</description> + <name>test</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Logical else tag as fallback if the if condition fails + </description> + <name>else</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyElseTag</tag-class> + <body-content>JSP</body-content> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Logical elseif tag to test whether the given condition is true + </description> + <name>elseif</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyElseIfTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The condition to test</description> + <name>test</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Tag to loop over a collection while the test expression returns true + </description> + <name>while</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyWhileTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The condition to test</description> + <name>test</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection</description> + <name>each</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyEachTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>true</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection</description> + <name>findAll</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyFindAllTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The expression to filter the elements to iterate over</description> + <name>expr</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>true</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection and collects the elements + you want to work with</description> + <name>collect</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyCollectTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The expression to use to collect the elements. The + expression must retur true to add the element to the + collection</description> + <name>expr</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection and filters the elements + with a regular expression</description> + <name>grep</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyGrepTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The regular expression to filter the element with. The + filter is a simple Groovy Regex</description> + <name>filter</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description>A tag that attempts to render an input for a bean property + into an appropriate component based on the type. It uses the templates + defined in "grails-app/views/scaffolding" to achieve this by looking up + the template by type.</description> + <name>renderInput</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyRenderInputTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The Bean to render the input for</description> + <name>bean</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The property of the bean to render input for</description> + <name>property</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> <name>link</name> <tag-class>org.codehaus.groovy.grails.web.taglib.jsp.JspLinkTag</tag-class> <body-content>JSP</body-content> racetrack_ch6/web-app/WEB-INF/tld/grails.tld @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" racetrack_ch6/web-app/WEB-INF/web.template.xml @@ -1,4 +1,4 @@ -<web-app xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd' version='2.4' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://java.sun.com/xml/ns/j2ee'><context-param><param-name>log4jConfigLocation</param-name><param-value>/WEB-INF/classes/log4j.properties</param-value></context-param><context-param><param-name>contextConfigLocation</param-name><param-value>/WEB-INF/applicationContext.xml</param-value></context-param><context-param><param-name>webAppRootKey</param-name><param-value>racetrack</param-value></context-param><filter><filter-name>sitemesh</filter-name><filter-class>org.codehaus.groovy.grails.web.sitemesh.GrailsPageFilter</filter-class></filter><filter><filter-name>charEncodingFilter</filter-name><filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class><init-param><param-name>targetBeanName</param-name><param-value>characterEncodingFilter</param-value></init-param><init-param><param-name>targetFilterLifecycle</param-name><param-value>true</param-value></init-param></filter><filter><filter-name>grailsWebRequest</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequestFilter</filter-class></filter><filter><filter-name>reloadFilter</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.filter.GrailsReloadServletFilter</filter-class></filter><filter-mapping><filter-name>charEncodingFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>grailsWebRequest</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>sitemesh</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>reloadFilter</filter-name><url-pattern>/base/*</url-pattern></filter-mapping><filter-mapping><filter-name>reloadFilter</filter-name><url-pattern>/user/*</url-pattern></filter-mapping><filter-mapping><filter-name>reloadFilter</filter-name><url-pattern>/registration/*</url-pattern></filter-mapping><filter-mapping><filter-name>reloadFilter</filter-name><url-pattern>/race/*</url-pattern></filter-mapping><listener><listener-class>org.springframework.web.util.Log4jConfigListener</listener-class></listener><listener><listener-class>org.codehaus.groovy.grails.web.context.GrailsContextLoaderListener</listener-class></listener><servlet><servlet-name>grails</servlet-name><servlet-class>org.codehaus.groovy.grails.web.servlet.GrailsDispatcherServlet</servlet-class><load-on-startup>1</load-on-startup></servlet><servlet><servlet-name>gsp</servlet-name><servlet-class>org.codehaus.groovy.grails.web.pages.GroovyPagesServlet</servlet-class><init-param><description> +<web-app xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd' version='2.4' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://java.sun.com/xml/ns/j2ee'><context-param><param-name>log4jConfigLocation</param-name><param-value>/WEB-INF/classes/log4j.properties</param-value></context-param><context-param><param-name>log4jRefreshInterval</param-name><param-value>1000</param-value></context-param><context-param><param-name>contextConfigLocation</param-name><param-value>/WEB-INF/applicationContext.xml</param-value></context-param><context-param><param-name>webAppRootKey</param-name><param-value>racetrack</param-value></context-param><filter><filter-name>sitemesh</filter-name><filter-class>org.codehaus.groovy.grails.web.sitemesh.GrailsPageFilter</filter-class></filter><filter><filter-name>charEncodingFilter</filter-name><filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class><init-param><param-name>targetBeanName</param-name><param-value>characterEncodingFilter</param-value></init-param><init-param><param-name>targetFilterLifecycle</param-name><param-value>true</param-value></init-param></filter><filter><filter-name>grailsWebRequest</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequestFilter</filter-class></filter><filter><filter-name>urlMapping</filter-name><filter-class>org.codehaus.groovy.grails.web.mapping.filter.UrlMappingsFilter</filter-class></filter><filter><filter-name>reloadFilter</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.filter.GrailsReloadServletFilter</filter-class></filter><filter-mapping><filter-name>charEncodingFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>grailsWebRequest</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>reloadFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>sitemesh</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>urlMapping</filter-name><url-pattern>/*</url-pattern></filter-mapping><listener><listener-class>org.springframework.web.util.Log4jConfigListener</listener-class></listener><listener><listener-class>org.codehaus.groovy.grails.web.context.GrailsContextLoaderListener</listener-class></listener><servlet><servlet-name>grails</servlet-name><servlet-class>org.codehaus.groovy.grails.web.servlet.GrailsDispatcherServlet</servlet-class><load-on-startup>1</load-on-startup></servlet><servlet><servlet-name>gsp</servlet-name><servlet-class>org.codehaus.groovy.grails.web.pages.GroovyPagesServlet</servlet-class><init-param><description> Allows developers to view the intermediade source code, when they pass - a spillGroovy argument in the URL. - </description><param-name>showSource</param-name><param-value>1</param-value></init-param></servlet><servlet-mapping><servlet-name>gsp</servlet-name><url-pattern>*.gsp</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>/base/*</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>/user/*</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>/registration/*</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>/race/*</url-pattern></servlet-mapping><welcome-file-list><welcome-file>index.jsp</welcome-file><welcome-file>index.gsp</welcome-file></welcome-file-list><jsp-config><taglib><taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri><taglib-location>/WEB-INF/tld/c.tld</taglib-location></taglib><taglib><taglib-uri>http://java.sun.com/jsp/jstl/fmt</taglib-uri><taglib-location>/WEB-INF/tld/fmt.tld</taglib-location></taglib><taglib><taglib-uri>http://www.springframework.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/spring.tld</taglib-location></taglib><taglib><taglib-uri>http://grails.codehaus.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/grails.tld</taglib-location></taglib></jsp-config></web-app> \ No newline at end of file + a spillGroovy argument in the URL. + </description><param-name>showSource</param-name><param-value>1</param-value></init-param></servlet><servlet-mapping><servlet-name>gsp</servlet-name><url-pattern>*.gsp</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>*.dispatch</url-pattern></servlet-mapping><welcome-file-list><welcome-file>index.jsp</welcome-file><welcome-file>index.gsp</welcome-file></welcome-file-list><jsp-config><taglib><taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri><taglib-location>/WEB-INF/tld/c.tld</taglib-location></taglib><taglib><taglib-uri>http://java.sun.com/jsp/jstl/fmt</taglib-uri><taglib-location>/WEB-INF/tld/fmt.tld</taglib-location></taglib><taglib><taglib-uri>http://www.springframework.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/spring.tld</taglib-location></taglib><taglib><taglib-uri>http://grails.codehaus.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/grails.tld</taglib-location></taglib></jsp-config></web-app> \ No newline at end of file racetrack_ch6/web-app/WEB-INF/web.xml @@ -124,4 +124,15 @@ td .errors { .prop .value { text-align:left; width:80%; +} + +.prevLink, .step, .currentStep, .nextLink { + padding-right: 5px; +} +.currentStep { + font-weight:bold; +} + +th.sorted a, th.sorted a:link, th.sorted a:visited, th.sorted a:hover, th.sortable a, th.sortable a:link, th.sortable a:visited, th.sortable a:hover { + color: white; } \ No newline at end of file racetrack_ch6/web-app/css/main.css @@ -1,7 +1,7 @@ function warnBeforeRaceDelete() { return confirm('Are you sure you want to delete this race?') -} +} function warnBeforeRegistrationDelete() { return confirm('Are you sure you want to delete this registration?') -} \ No newline at end of file +} racetrack_ch6/web-app/js/racetrack.js @@ -10,7 +10,9 @@ <classpathentry kind="src" path="grails-tests"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="var" path="GRAILS_HOME/ant/lib/ant.jar"/> - <classpathentry kind="var" path="GRAILS_HOME/lib/ant-nodeps.jar" /> + <classpathentry kind="var" path="GRAILS_HOME/lib/ant-junit.jar" /> + +<classpathentry kind="var" path="GRAILS_HOME/lib/ant-nodeps.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/ant.jar" /> @@ -48,9 +50,9 @@ <classpathentry kind="var" path="GRAILS_HOME/lib/ejb3-persistence.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/gant-0.2.2-SNAPSHOT.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/gant-0.2.5-SNAPSHOT.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/groovy-all-1.0.1-SNAPSHOT.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/groovy-all-1.1-BETA-1.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/groovy-starter.jar" /> @@ -80,13 +82,13 @@ <classpathentry kind="var" path="GRAILS_HOME/lib/log4j-1.2.8.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/ognl-2.7.jar" /> - <classpathentry kind="var" path="GRAILS_HOME/lib/org.mortbay.jetty.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/oro-2.0.8.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/quartz-1.5.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/quartz-1.6.0.jar" /> + +<classpathentry kind="var" path="GRAILS_HOME/lib/serializer.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/servletapi-2.4.jar" /> @@ -106,18 +108,20 @@ <classpathentry kind="var" path="GRAILS_HOME/lib/standard-2.4.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/xalan.jar" /> + <classpathentry kind="var" path="GRAILS_HOME/lib/xerces-2.6.2.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/xml-apis.jar" /> - <classpathentry kind="var" path="GRAILS_HOME/dist/grails-core-0.4.2.jar" /> + <classpathentry kind="var" path="GRAILS_HOME/dist/grails-core-0.5.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/dist/grails-crud-0.4.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/dist/grails-crud-0.5.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/dist/grails-gorm-0.4.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/dist/grails-gorm-0.5.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/dist/grails-web-0.4.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/dist/grails-web-0.5.jar" /> <classpathentry kind="output" path="web-app/WEB-INF/classes"/> racetrack_ch7/.classpath @@ -1,4 +1,4 @@ -#Do not edit app.grails.* properties, they may change automatically. DO NOT put application configuration in here, it is not the right place! -#Sun Mar 11 15:49:46 EDT 2007 -app.grails.version=0.4.2 +#Wed May 02 20:22:50 EDT 2007 +app.version=0.1 +app.grails.version=0.5 app.name=racetrack racetrack_ch7/application.properties @@ -1,11 +1,12 @@ -class ApplicationBootStrap { - def init = { servletContext -> +class ApplicationBootStrap { + + def init = { servletContext -> final String BACKUP_ADMIN = 'adminjoe' if (!User.findByUserId(BACKUP_ADMIN)) { new User(userId:BACKUP_ADMIN,password:'password').save() } - } - - def destroy = { - } -} + } + + def destroy = { + } +} \ No newline at end of file racetrack_ch7/grails-app/conf/ApplicationBootStrap.groovy @@ -1,8 +1,8 @@ -class DevelopmentDataSource { +class DevelopmentDataSource { boolean pooling = true String dbCreate = "update" String url = "jdbc:mysql://localhost/racetrack_dev" String driverClassName = "com.mysql.jdbc.Driver" String username = "jason" String password = "" -} +} racetrack_ch7/grails-app/conf/DevelopmentDataSource.groovy @@ -1,8 +1,8 @@ -class TestDataSource { - boolean pooling = true +class TestDataSource { + boolean pooling = true String dbCreate = "update" String url = "jdbc:mysql://localhost/racetrack_test" String driverClassName = "com.mysql.jdbc.Driver" String username = "jason" - String password = "" -} + String password = "" +} racetrack_ch7/grails-app/conf/TestDataSource.groovy @@ -4,7 +4,28 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.rootLogger=error, stdout -# Enable this logger to log Hibernate output +# This logger is for your own application artefact logs +# Artefacts are logged by their type and optionally class name i.e: +# +# log4j.logger.grails.app.controller.HelloController=debug, stdout +# ...will control the logs from just that controller +# +# log4j.logger.grails.app.domain=trace, stdout +# ...will control the logs for all domain classes +# +# At the time of writing, supported artefact type ids include: +# domain (aka Domain Class), task (aka Job), service, dataSource, +# controller, tagLib, urlMappings, codec, bootstrap +# +# The default "info" level for all artefacts is set here +log4j.logger.grails.app=info,stdout +log4j.additivity.grails.app=false + +## This logger is for Grails' public APIs within the grails. package +log4j.logger.grails=info,stdout +log4j.additivity.grails=false + +## Enable this logger to log Hibernate output # handy to see its database interaction activity #log4j.logger.org.hibernate=debug,stdout #log4j.additivity.org.hibernate=false @@ -37,7 +58,3 @@ log4j.logger.org.codehaus.groovy.grails.plugins=info,stdout log4j.additivity.org.codehaus.groovy.grails.plugins=false log4j.logger.grails.spring=info,stdout log4j.additivity.grails.spring=false - -# This logger is for Grails' public APIs within the grails. package -log4j.logger.grails=info,stdout -log4j.additivity.grails=false racetrack_ch7/grails-app/conf/log4j.development.properties @@ -4,7 +4,28 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.rootLogger=error, stdout -# Enable this logger to log Hibernate output +# This logger is for your own application artefact logs +# Artefacts are logged by their type and optionally class name i.e: +# +# log4j.logger.grails.app.controller.HelloController=debug, stdout +# ...will control the logs from just that controller +# +# log4j.logger.grails.app.domain=trace, stdout +# ...will control the logs for all domain classes +# +# At the time of writing, supported artefact type ids include: +# domain (aka Domain Class), task (aka Job), service, dataSource, +# controller, tagLib, urlMappings, codec, bootstrap +# +# The default "info" level for all artefacts is set here +log4j.logger.grails.app=info,stdout +log4j.additivity.grails.app=false + +## This logger is for Grails' public APIs within the grails. package +log4j.logger.grails=info,stdout +log4j.additivity.grails=false + +## Enable this logger to log Hibernate output # handy to see its database interaction activity #log4j.logger.org.hibernate=debug,stdout #log4j.additivity.org.hibernate=false @@ -37,7 +58,3 @@ log4j.logger.org.codehaus.groovy.grails.plugins=info,stdout log4j.additivity.org.codehaus.groovy.grails.plugins=false log4j.logger.grails.spring=info,stdout log4j.additivity.grails.spring=false - -# This logger is for Grails' public APIs within the grails. package -log4j.logger.grails=info,stdout -log4j.additivity.grails=false racetrack_ch7/grails-app/conf/log4j.production.properties @@ -4,7 +4,28 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.rootLogger=error, stdout -# Enable this logger to log Hibernate output +# This logger is for your own application artefact logs +# Artefacts are logged by their type and optionally class name i.e: +# +# log4j.logger.grails.app.controller.HelloController=debug, stdout +# ...will control the logs from just that controller +# +# log4j.logger.grails.app.domain=trace, stdout +# ...will control the logs for all domain classes +# +# At the time of writing, supported artefact type ids include: +# domain (aka Domain Class), task (aka Job), service, dataSource, +# controller, tagLib, urlMappings, codec, bootstrap +# +# The default "info" level for all artefacts is set here +log4j.logger.grails.app=info,stdout +log4j.additivity.grails.app=false + +## This logger is for Grails' public APIs within the grails. package +log4j.logger.grails=info,stdout +log4j.additivity.grails=false + +## Enable this logger to log Hibernate output # handy to see its database interaction activity #log4j.logger.org.hibernate=debug,stdout #log4j.additivity.org.hibernate=false @@ -37,7 +58,3 @@ log4j.logger.org.codehaus.groovy.grails.plugins=info,stdout log4j.additivity.org.codehaus.groovy.grails.plugins=false log4j.logger.grails.spring=info,stdout log4j.additivity.grails.spring=false - -# This logger is for Grails' public APIs within the grails. package -log4j.logger.grails=info,stdout -log4j.additivity.grails=false racetrack_ch7/grails-app/conf/log4j.test.properties @@ -2,11 +2,13 @@ abstract class BaseController { def auth() { if(!session.userId) { def originalRequestParams = [controller:controllerName, action:actionName] + originalRequestParams.putAll(params) + session.originalRequestParams = originalRequestParams redirect(controller:'user',action:'login') return false } - } -} \ No newline at end of file + } +} \ No newline at end of file racetrack_ch7/grails-app/controllers/BaseController.groovy @@ -1,6 +1,6 @@ -class RaceController extends BaseController { - def beforeInterceptor = [action:this.&auth, except:['search']] +class RaceController extends BaseController { + def beforeInterceptor = [action:this.&auth, except:['search']] def index = { redirect(action:list,params:params) } @@ -48,8 +48,8 @@ class RaceController extends BaseController { def race = Race.get( params.id ) if(race) { race.properties = params - if(race.save()) { - flash.message = "${params.name} updated." + if(race.save()) { + flash.message = "${params.name} updated." redirect(action:show,id:race.id) } else { @@ -72,7 +72,7 @@ class RaceController extends BaseController { def race = new Race() race.properties = params if(race.save()) { - flash.message = "${params.name} saved." + flash.message = "${params.name} saved." redirect(action:show,id:race.id) } else { @@ -80,42 +80,41 @@ class RaceController extends BaseController { } } - def search = { - if (request.method == 'POST') { - RaceQuery query = new RaceQuery() - bindData(query, params) - - def criteria = Race.createCriteria() - - def results = criteria { - and { - like('city', '%' + query.city + '%') - like('state', '%' + query.state + '%') - if (query.distance) { - switch (query.distanceOperator) { - case RaceQuery.DistanceOperator.AT_LEAST: - ge('distance', query.distance) - break - case RaceQuery.DistanceOperator.EXACTLY: - eq('distance', query.distance) - break - case RaceQuery.DistanceOperator.AT_MOST: - le('distance', query.distance) - break - default: - log.error "Found unexpected value for distance" - + " operator - ${query.distanceOperator}" - } - } - // Add 1 day (24 hours) to the max date. (If user selects a max - // date of Jan 1st, the date object will hold Jan 1st 00:00, but - // the user will want any events occurring thru Jan 1st 23:59.) - between('startDateTime', query.minDate, query.maxDate + 1) - } - } - - render(view:'searchresults', model:[ raceList: results ]) - } - } - + def search = { + if (request.method == 'POST') { + RaceQuery query = new RaceQuery() + bindData(query, params) + + def criteria = Race.createCriteria() + + def results = criteria { + and { + like('city', '%' + query.city + '%') + like('state', '%' + query.state + '%') + if (query.distance) { + switch (query.distanceOperator) { + case RaceQuery.DistanceOperator.AT_LEAST: + ge('distance', query.distance) + break + case RaceQuery.DistanceOperator.EXACTLY: + eq('distance', query.distance) + break + case RaceQuery.DistanceOperator.AT_MOST: + le('distance', query.distance) + break + default: + log.error "Found unexpected value for distance" + + " operator - ${query.distanceOperator}" + } + } + // Add 1 day (24 hours) to the max date. If user selects a max + // date of Jan 1st, the date object will hold Jan 1st 00:00, but + // the user will want any events occurring thru Jan 1st 23:59. + between('startDateTime', query.minDate, query.maxDate + 1) + } + } + + render(view:'searchresults', model:[ raceList: results.adaptee ]) + } + } } \ No newline at end of file racetrack_ch7/grails-app/controllers/RaceController.groovy @@ -1,6 +1,6 @@ -class RegistrationController extends BaseController { - def beforeInterceptor = [action:this.&auth, except:'register'] +class RegistrationController extends BaseController { + def beforeInterceptor = [action:this.&auth, except:'register'] def index = { redirect(action:list,params:params) } @@ -49,7 +49,7 @@ class RegistrationController extends BaseController { if(registration) { registration.properties = params if(registration.save()) { - flash.message = "${params.name} updated." + flash.message = "${params.name} updated." redirect(action:show,id:registration.id) } else { @@ -72,7 +72,7 @@ class RegistrationController extends BaseController { def registration = new Registration() registration.properties = params if(registration.save()) { - flash.message = "${params.name} saved." + flash.message = "${params.name} saved." redirect(action:show,id:registration.id) } else { @@ -80,6 +80,7 @@ class RegistrationController extends BaseController { } } + def register = { def registration = new Registration() registration.properties = params @@ -90,8 +91,7 @@ class RegistrationController extends BaseController { } else { if(registration.save()) { - flash.message = - "Successfully registered for ${registration.race.name}" + flash.message = "Successfully registered for ${registration.race.name}" redirect(controller:'race',action:'search') } else { @@ -99,5 +99,5 @@ class RegistrationController extends BaseController { return ['registration':registration,'race':race] } } - } + } } \ No newline at end of file racetrack_ch7/grails-app/controllers/RegistrationController.groovy @@ -1,7 +1,7 @@ class UserController extends BaseController { def beforeInterceptor = [action:this.&auth, except:['login', 'logout']] - + def index = { redirect(action:list,params:params) } // the delete, save and update actions only racetrack_ch7/grails-app/controllers/UserController.groovy @@ -1,4 +1,4 @@ -class Race { +class Race { String name Date startDateTime String city @@ -7,16 +7,16 @@ class Race { Float cost Integer maxRunners = 100000 - static hasMany = [registrations:Registration] + static hasMany = [registrations:Registration] static constraints = { - name(maxLength:50,blank:false) - startDateTime(validator: {return (it > new Date())}) - city(maxLength:30,blank:false) + name(maxSize:50,blank:false) + startDateTime(validator: {return (it > new Date())}) + city(maxSize:30,blank:false) state(inList:['GA', 'NC', 'SC', 'VA'],blank:false) distance(min:3.1f,max:100f) cost(min:0f,max:999.99f) - } + } - String toString() {"${this.name} : ${this.city}, ${this.state}"} -} \ No newline at end of file + String toString() {"${this.name} : ${this.city}, ${this.state}" } +} racetrack_ch7/grails-app/domain/Race.groovy @@ -1,4 +1,4 @@ -class Registration { +class Registration { Race race String name Date dateOfBirth @@ -6,19 +6,17 @@ class Registration { String postalAddress String emailAddress Date createdAt = new Date() - + static belongsTo = Race - - static optionals = ["postalAddress" ] - + static constraints = { - name(maxLength:50,blank:false) + name(maxSize:50,blank:false) dateOfBirth(nullable:false) gender(inList:["M", "F"]) - postalAddress(maxLength:255) - emailAddress(maxLength:50,email:true) + postalAddress(nullable:true,maxSize:255) + emailAddress(maxSize:50,email:true) race(nullable:false) } - - String toString() {"${this.name} : ${this.emailAddress}"} -} \ No newline at end of file + + String toString(){"${this.name}:${this.emailAddress}"} +} racetrack_ch7/grails-app/domain/Registration.groovy @@ -3,7 +3,7 @@ class User { String password static constraints = { - userId(length:6..8,unique:true) - password(length:6..8) + userId(size:6..8,unique:true) + password(size:6..8) } } \ No newline at end of file racetrack_ch7/grails-app/domain/User.groovy @@ -1,29 +1,28 @@ default.doesnt.match.message=Property [{0}] of class [{1}] with value [{2}] does not match the required pattern [{3}] default.invalid.url.message=Property [{0}] of class [{1}] with value [{2}] is not a valid URL default.invalid.creditCard.message=Property [{0}] of class [{1}] with value [{2}] is not a valid credit card number -default.invalid.email.message=Property [{0}] of class [{1}] with value [{2}] is not a valid e-mail address. -default.invalid.message=Property [{0}] of class [{1}] is not a valid [{2}]. +default.invalid.email.message=Property [{0}] of class [{1}] with value [{2}] is not a valid e-mail address default.invalid.range.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid range from [{3}] to [{4}] default.invalid.size.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid size range from [{3}] to [{4}] -default.invalid.length.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid size range from [{3}] to [{4}] -default.invalid.min.message=Property [{0}] of class [{1}] with value [{2}] is less than minimum value [{3}] default.invalid.max.message=Property [{0}] of class [{1}] with value [{2}] exceeds maximum value [{3}] -default.invalid.max.length.message=Property [{0}] of class [{1}] with value [{2}] exceeds the maximum size of [{3}] -default.invalid.min.length.message=Property [{0}] of class [{1}] with value [{2}] is less than the minimum size of [{3}] +default.invalid.min.message=Property [{0}] of class [{1}] with value [{2}] is less than minimum value [{3}] default.invalid.max.size.message=Property [{0}] of class [{1}] with value [{2}] exceeds the maximum size of [{3}] default.invalid.min.size.message=Property [{0}] of class [{1}] with value [{2}] is less than the minimum size of [{3}] +default.invalid.validator.message=Property [{0}] of class [{1}] with value [{2}] does not pass custom validation default.not.inlist.message=Property [{0}] of class [{1}] with value [{2}] is not contained within the list [{3}] default.blank.message=Property [{0}] of class [{1}] cannot be blank default.not.equal.message=Property [{0}] of class [{1}] with value [{2}] cannot equal [{3}] default.null.message=Property [{0}] of class [{1}] cannot be null default.not.unique.message=Property [{0}] of class [{1}] with value [{2}] must be unique -default.not.editable.message=Property [{0}] of class [{1}] with value [{2}] cannot be changed from [{3}] -race.name.blank=Please enter a name for this race +default.paginate.prev=Previous +default.paginate.next=Next + +race.name.blank=Please enter a name for this race race.distance.max.exceeded=Please enter a valid distance no more than {3} miles race.startDateTime.validator.invalid=Please enter a future date and time race.city.blank=Please enter a city for this race -race.city.maxLength.exceeded=Please limit the city name to a maximum length of {3} characters +race.city.maxSize.exceeded=Please limit the city name to a maximum length of {3} characters race.distance.nullable=Please enter a valid distance race.distance.min.notmet=Please enter a valid distance no fewer than {3} miles race.distance.max.exceeded=Please enter a valid distance no more than {3} miles @@ -32,8 +31,8 @@ race.cost.min.notmet=Please enter a valid cost of at least ${3} race.cost.max.exceeded=Please enter a valid cost no more than ${3} registration.name.blank=Please enter a name -registration.name.maxLength.exceeded=Please limit the name to a maximum length of {3} characters -registration.postalAddress.maxLength.exceeded=Please limit the postal address to a maximum length of {3} characters +registration.name.maxSize.exceeded=Please limit the name to a maximum length of {3} characters +registration.postalAddress.maxSize.exceeded=Please limit the postal address to a maximum length of {3} characters registration.emailAddress.blank=Please enter an e-mail address -registration.emailAddress.maxLength.exceeded=Please limit the e-mail address to a maximum length of {3} characters +registration.emailAddress.maxSize.exceeded=Please limit the e-mail address to a maximum length of {3} characters registration.emailAddress.email.invalid=Please enter a valid e-mail address \ No newline at end of file racetrack_ch7/grails-app/i18n/messages.properties @@ -1,18 +1,22 @@ <g:if test="${!session.userId}"> <span class="menuButton"> - <g:link controller="user" action="login">Log in</g:link> + <g:link controller="user" action="login">Log +in</g:link> </span> </g:if> <g:else> <span class="menuButton"> <g:link controller="race" action="list"> - Manage Races & Registrations + Manage Races &amp; Registrations </g:link> </span> <span class="menuButton"> - <g:link controller="user" action="list">Manage Administrators</g:link> + <g:link controller="user" action="list">Manage Administrators + </g:link> </span> <span class="menuButton"> - <g:link controller="user" action="logout">Log out</g:link> + <g:link controller="user" action="logout"> + Log out + </g:link> </span> </g:else> racetrack_ch7/grails-app/views/_adminmenubar.gsp @@ -16,4 +16,4 @@ </tr> </table> </body> -</html> +</html> \ No newline at end of file racetrack_ch7/grails-app/views/layouts/public.gsp @@ -28,19 +28,19 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='startDateTime'>Start Date Time:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'startDateTime','errors')}'><g:datePicker name='startDateTime' value="${race?.startDateTime}"></g:datePicker></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='state'>State:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'state','errors')}'><g:select name='state' from='${race.constraints.state.inList.collect{it.encodeAsHTML()}}' value="${race.state?.encodeAsHTML()}"></g:select></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}" /></td></tr> </tbody> </table> racetrack_ch7/grails-app/views/race/create.gsp @@ -31,19 +31,19 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='startDateTime'>Start Date Time:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'startDateTime','errors')}'><g:datePicker name='startDateTime' value="${race?.startDateTime}"></g:datePicker></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='state'>State:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'state','errors')}'><g:select name='state' from='${race.constraints.state.inList.collect{it.encodeAsHTML()}}' value="${race.state?.encodeAsHTML()}"></g:select></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}" /></td></tr> <tr class='prop'><td valign='top' class='name'><label for='registrations'>Registrations:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'registrations','errors')}'><ul> <g:each var='r' in='${race?.registrations?}'> racetrack_ch7/grails-app/views/race/edit.gsp @@ -10,7 +10,7 @@ <span class="menuButton"><a href="${createLinkTo(dir:'')}">Home</a></span> <span class="menuButton"><g:link action="create">New Race</g:link></span> <span class="menuButton"> - <g:link action="search">Search for Races</g:link> + <g:link action="search">Search for Races</g:link> </span> <g:render template="/adminmenubar" /> </div> @@ -24,17 +24,17 @@ <table> <thead> <tr> - <th>Name</th> - - <th>Start Date Time</th> - - <th>City</th> - - <th>State</th> - - <th>Distance</th> - - <th></th> + <g:sortableColumn property="name" title="Name" /> + + <g:sortableColumn property="startDateTime" title="Start Date Time" /> + + <g:sortableColumn property="city" title="City" /> + + <g:sortableColumn property="state" title="State" /> + + <g:sortableColumn property="distance" title="Distance" /> + + <th></th> </tr> </thead> <tbody> racetrack_ch7/grails-app/views/race/list.gsp @@ -1,14 +1,15 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <meta http-equiv="Content-Type" content="text/html; + charset=UTF-8"/> <meta name="layout" content="public" /> <title>Search for Races</title> </head> <body> - <div class="nav"> - <g:render template="/adminmenubar" /> - </div> - <div class="body"> + <div class="nav"> + <g:render template="/adminmenubar" /> + </div> + <div class="body"> <h1>Search for Races</h1> <g:if test="${flash.message}"> <div class="message">${flash.message}</div> @@ -30,34 +31,37 @@ <label for='state'>State:</label> </td> <td valign='top' class='value'> - <g:select name='state' from='${[""] + new Race().constraints.state.inList}'> + <g:select name='state' + from='${[""] + new Race().constraints.state.inList}'> </g:select> </td> </tr> - <tr class='prop'> - <td valign='top' class='name'> - <label for='date'>Date:</label> - </td> - <td valign='top' class='value'> - between - <g:datePicker name='minDate' precision='day' /> - and - <g:datePicker name='maxDate' precision='day' value='${new Date().plus(365*2)}'/> - </td> - </tr> - <tr class='prop'> - <td valign='top' class='name'> - <label for='distance'>Distance:</label> - </td> - <td valign='top' class='value'> - <select name='distanceOperator' > - <option value='AT_LEAST' >At least</option> - <option value='EXACTLY' >Exactly</option> - <option value='AT_MOST' >At most</option> - </select> - <input type='text' name='distance' size='5'></input> mi - </td> - </tr> + <tr class='prop'> + <td valign='top' class='name'> + <label for='date'>Date:</label> + </td> + <td valign='top' class='value'> + between + <g:datePicker name='minDate' precision='day' /> + and + <g:datePicker name='maxDate' precision='day' + value='${new Date().plus(365*2)}'/> + </td> + </tr> + <tr class='prop'> + <td valign='top' class='name'> + <label for='distance'>Distance:</label> + </td> + <td valign='top' class='value'> + <select name='distanceOperator' > + <option value='AT_LEAST' >At least</option> + <option value='EXACTLY' >Exactly</option> + <option value='AT_MOST' >At most</option> + </select> + <input type='text' name='distance' size='5'> + </input> mi + </td> + </tr> </table> </div> <div class="buttons"> racetrack_ch7/grails-app/views/race/search.gsp @@ -84,4 +84,4 @@ </div> </div> </body> -</html> \ No newline at end of file +</html> racetrack_ch7/grails-app/views/race/searchresults.gsp @@ -1,7 +1,7 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <g:javascript library="racetrack" /> <meta name="layout" content="main" /> <title>Show Race</title> racetrack_ch7/grails-app/views/race/show.gsp @@ -25,10 +25,7 @@ <div class="dialog"> <table> <tbody> - - - - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='dateOfBirth'>Date Of Birth:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'dateOfBirth','errors')}'><g:datePicker name='dateOfBirth' value="${registration?.dateOfBirth}" precision='day'></g:datePicker></td></tr> @@ -36,12 +33,10 @@ <tr class='prop'><td valign='top' class='name'><label for='postalAddress'>Postal Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'postalAddress','errors')}'><textarea rows='5' cols='40' name='postalAddress'>${registration?.postalAddress?.encodeAsHTML()}</textarea></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='race'>Race:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'race','errors')}'><g:select optionKey="id" from="${Race.list()}" name='race.id' value="${registration?.race?.id}"></g:select></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='createdAt'>Created At:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'createdAt','errors')}'><g:datePicker name='createdAt' value="${registration?.createdAt}"></g:datePicker></td></tr> - </tbody> </table> </div> racetrack_ch7/grails-app/views/registration/create.gsp @@ -31,7 +31,7 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='dateOfBirth'>Date Of Birth:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'dateOfBirth','errors')}'><g:datePicker name='dateOfBirth' value="${registration?.dateOfBirth}" precision='day'></g:datePicker></td></tr> @@ -39,7 +39,7 @@ <tr class='prop'><td valign='top' class='name'><label for='postalAddress'>Postal Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'postalAddress','errors')}'><textarea rows='5' cols='40' name='postalAddress'>${registration?.postalAddress?.encodeAsHTML()}</textarea></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='race'>Race:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'race','errors')}'><g:select optionKey="id" from="${Race.list()}" name='race.id' value="${registration?.race?.id}"></g:select></td></tr> @@ -51,7 +51,7 @@ <div class="buttons"> <span class="button"><g:actionSubmit value="Update" /></span> - <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRaceDelete();"/></span> + <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRegistrationDelete();" /></span> </div> </g:form> </div> racetrack_ch7/grails-app/views/registration/edit.gsp @@ -21,17 +21,17 @@ <table> <thead> <tr> - <th>Name</th> - - <th>Date Of Birth</th> - - <th>Gender</th> - - <th>Postal Address</th> - - <th>Email Address</th> - - <th></th> + <g:sortableColumn property="name" title="Name" /> + + <g:sortableColumn property="dateOfBirth" title="Date Of Birth" /> + + <g:sortableColumn property="gender" title="Gender" /> + + <g:sortableColumn property="postalAddress" title="Postal Address" /> + + <g:sortableColumn property="emailAddress" title="Email Address" /> + + <th></th> </tr> </thead> <tbody> racetrack_ch7/grails-app/views/registration/list.gsp @@ -5,10 +5,10 @@ <title>Register</title> </head> <body> + <div class="body"> <div class="nav"> <g:render template="/adminmenubar" /> </div> - <div class="body"> <h1>Register for ${race.name} </h1> <em>Start Date: <g:formatDate date="${race.startDateTime}" format="EEE, MMM d, yyyy"/> @@ -89,4 +89,4 @@ </g:form> </div> </body> -</html> \ No newline at end of file +</html> racetrack_ch7/grails-app/views/registration/register.gsp @@ -78,7 +78,7 @@ <g:form controller="registration"> <input type="hidden" name="id" value="${registration?.id}" /> <span class="button"><g:actionSubmit value="Edit" /></span> - <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRaceDelete();"/></span> + <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRegistrationDelete();" /></span> </g:form> </div> </div> racetrack_ch7/grails-app/views/registration/show.gsp @@ -9,6 +9,7 @@ <div class="nav"> <span class="menuButton"><a href="${createLinkTo(dir:'')}">Home</a></span> <span class="menuButton"><g:link action="list">User List</g:link></span> + <g:render template="/adminmenubar" /> </div> <div class="body"> <h1>Create User</h1> @@ -27,9 +28,9 @@ - <tr class='prop'><td valign='top' class='name'><label for='userId'>User Id:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'userId','errors')}'><input type="text" maxlength='8' name='userId' value="${user?.userId?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='userId'>User Id:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'userId','errors')}'><input type="text" maxlength='8' name='userId' value="${user?.userId?.encodeAsHTML()}"/></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='password'>Password:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'password','errors')}'><input type="text" maxlength='8' name='password' value="${user?.password?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='password'>Password:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'password','errors')}'><input type="text" maxlength='8' name='password' value="${user?.password?.encodeAsHTML()}"/></td></tr> </tbody> </table> racetrack_ch7/grails-app/views/user/create.gsp @@ -10,6 +10,7 @@ <span class="menuButton"><a href="${createLinkTo(dir:'')}">Home</a></span> <span class="menuButton"><g:link action="list">User List</g:link></span> <span class="menuButton"><g:link action="create">New User</g:link></span> + <g:render template="/adminmenubar" /> </div> <div class="body"> <h1>Edit User</h1> @@ -33,9 +34,9 @@ - <tr class='prop'><td valign='top' class='name'><label for='userId'>User Id:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'userId','errors')}'><input type="text" maxlength='8' name='userId' value="${user?.userId?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='userId'>User Id:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'userId','errors')}'><input type="text" maxlength='8' name='userId' value="${user?.userId?.encodeAsHTML()}"/></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='password'>Password:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'password','errors')}'><input type="text" maxlength='8' name='password' value="${user?.password?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='password'>Password:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'password','errors')}'><input type="text" maxlength='8' name='password' value="${user?.password?.encodeAsHTML()}"/></td></tr> </tbody> </table> racetrack_ch7/grails-app/views/user/edit.gsp @@ -9,6 +9,7 @@ <div class="nav"> <span class="menuButton"><a href="${createLinkTo(dir:'')}">Home</a></span> <span class="menuButton"><g:link action="create">New User</g:link></span> + <g:render template="/adminmenubar" /> </div> <div class="body"> <h1>User List</h1> @@ -20,15 +21,14 @@ <table> <thead> <tr> - - - <th>Id</th> - - <th>User Id</th> - - <th>Password</th> - - <th></th> + + <g:sortableColumn property="id" title="Id" /> + + <g:sortableColumn property="userId" title="User Id" /> + + <g:sortableColumn property="password" title="Password" /> + + <th></th> </tr> </thead> <tbody> racetrack_ch7/grails-app/views/user/list.gsp @@ -44,4 +44,4 @@ </g:form> </div> </body> -</html> +</html> \ No newline at end of file racetrack_ch7/grails-app/views/user/login.gsp @@ -10,6 +10,7 @@ <span class="menuButton"><a href="${createLinkTo(dir:'')}">Home</a></span> <span class="menuButton"><g:link action="list">User List</g:link></span> <span class="menuButton"><g:link action="create">New User</g:link></span> + <g:render template="/adminmenubar" /> </div> <div class="body"> <h1>Show User</h1> racetrack_ch7/grails-app/views/user/show.gsp @@ -18,7 +18,7 @@ class RaceTests extends GroovyTestCase { def race = getValidRace() race.name = 'It may very well take longer to type out the name of ' + 'this race than to just go run it.' - assertValidationError(race, 'name', 'race.name.maxLength.exceeded') + assertValidationError(race, 'name', 'race.name.maxSize.exceeded') } void testNameNullConstraint() { @@ -48,7 +48,7 @@ class RaceTests extends GroovyTestCase { void testCityMaxConstraint() { def race = getValidRace() race.city = 'I pity the fool that lives in a city with a name this long.' - assertValidationError(race, 'city', 'race.city.maxLength.exceeded') + assertValidationError(race, 'city', 'race.city.maxSize.exceeded') } void testStateNullConstraint() { @@ -84,7 +84,7 @@ class RaceTests extends GroovyTestCase { void testDistanceMaxConstraint() { def race = getValidRace() race.distance = 100.0001 - assertValidationError(race, 'distance', 'race.distance.max.exceeded') // TODO Explain where to find the list of error codes - the validation reference page + assertValidationError(race, 'distance', 'race.distance.max.exceeded') } void testCostNullConstraint() { racetrack_ch7/grails-tests/RaceTests.groovy @@ -25,7 +25,10 @@ import org.springframework.context.NoSuchMessageException; import org.springframework.web.servlet.support.RequestContextUtils as RCU; import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU; -class ApplicationTagLib { +class ApplicationTagLib { + + def grailsUrlMappingsHolder + /** * Creates a link to a resource, generally used as a method rather than a tag. * @@ -33,7 +36,7 @@ class ApplicationTagLib { */ def createLinkTo = { attrs -> out << grailsAttributes.getApplicationUri(request) - if(attrs['dir']) { + if(attrs['dir'] || attrs['dir'] == '') { out << "/${attrs['dir']}" } if(attrs['file']) { @@ -50,7 +53,7 @@ class ApplicationTagLib { def link = { attrs, body -> out << "<a href=\"" // create the link - createLink(attrs) + out << createLink(attrs) out << '\" ' // process remaining attributes @@ -59,7 +62,7 @@ class ApplicationTagLib { } out << ">" // output the body - body() + out << body() // close tag out << "</a>" @@ -79,29 +82,47 @@ class ApplicationTagLib { if(attrs['url']) { attrs = attrs.remove('url') } - // if the current attribute null set the controller uri to the current controller - if(attrs["controller"]) { - out << '/' << attrs.remove("controller") - } - else { - out << grailsAttributes.getControllerUri(request) - } - if(attrs["action"]) { - out << '/' << attrs.remove("action") - } - if(attrs["id"]) { - out << '/' << attrs.remove("id") - } - if(attrs['params']) { - def pms = attrs.remove('params') - out << '?' - def i = 0 - pms.each { k,v -> - out << "${k.encodeAsURL()}=${v?.encodeAsURL()}" - if(++i < pms.size()) - out << '&' - } - } + + def controller = attrs.containsKey("controller") ? attrs.remove("controller") : grailsAttributes.getController(request).controllerName + def action = attrs.remove("action") + def id = attrs.remove("id") + def params = attrs.params ? attrs.remove('params') : [:] + + def url + try { + if(id) params.id = id + def mapping = grailsUrlMappingsHolder?.getReverseMapping(controller,action,params) + params.controller = controller + if(action) params.action = action + url = mapping?.createURL(params) + } + finally { + params.remove('controller') + params.remove('action') + params.remove('id') + } + if(url) { + out << url + } + else { + out << '/' << controller + if(action) { + out << '/' << action + } + if(id) { + out << '/' << id + } + if(params) { + out << '?' + def i = 0 + params.each { k,v -> + out << "${k.encodeAsURL()}=${v?.encodeAsURL()}" + if(++i < params.size()) + out << '&' + } + } + } + } /** @@ -127,8 +148,8 @@ class ApplicationTagLib { } } } - out << '>' - body() + out << '>' + out << body() out << "</${attrs.name}>" } } racetrack_ch7/plugins/core/grails-app/taglib/ApplicationTagLib.groovy @@ -16,6 +16,7 @@ import org.springframework.validation.Errors; import org.springframework.context.NoSuchMessageException; import org.springframework.web.servlet.support.RequestContextUtils as RCU; import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU; +import org.codehaus.groovy.grails.commons.DomainClassArtefactHandler; /** * A tag lib that provides tags for working with form controls @@ -33,7 +34,10 @@ class FormTagLib { def textField = { attrs -> attrs.type = "text" attrs.tagName = "textField" - field(attrs) + def result = field(attrs) + if(result) { + out << result + } } /** * Creates a hidden field @@ -41,7 +45,7 @@ class FormTagLib { def hiddenField = { attrs -> attrs.type = "hidden" attrs.tagName = "hiddenField" - field(attrs) + out << field(attrs) } /** * Creates a submit button @@ -49,7 +53,7 @@ class FormTagLib { def submitButton = { attrs -> attrs.type = "submit" attrs.tagName = "submitButton" - field(attrs) + out << field(attrs) } /** * A general tag for creating fields @@ -84,7 +88,7 @@ class FormTagLib { void resolveAttributes(attrs) { if(!attrs.name && !attrs.field) { - throwTagError("Tag [$tagName] is missing required attribute [name] or [field]") + throwTagError("Tag [${attrs.tagName}] is missing required attribute [name] or [field]") } attrs.remove('tagName') @@ -121,7 +125,7 @@ class FormTagLib { def form = { attrs, body -> out << "<form action=\"" // create the link - createLink(attrs) + out << createLink(attrs) out << '\" ' // default to post @@ -133,26 +137,34 @@ class FormTagLib { out << ">" // output the body - body() + def bodyContent = body() + out << bodyContent // close tag out << "</form>" } /** * Creates a submit button that submits to an action in the controller specified by the form action - * The value of the action attribute is translated into the action name, for example "Edit" becomes - * "edit" or "List People" becomes "listPeople" + * The name of the action attribute is translated into the action name, for example "Edit" becomes + * "_action_edit" or "List People" becomes "_action_listPeople" + * If the action attribute is not specified, the value attribute will be used as part of the action name * * <g:actionSubmit value="Edit" /> + * <g:actionSubmit action="Edit" value="Some label for editing" /> * */ def actionSubmit = { attrs -> - out << '<input type="submit" name="_action" ' - def value = attrs.remove('value') - if(value) { - out << "value=\"${value}\" " + if(!attrs.value) { + throwTagError("Tag [$tagName] is missing required attribute [value]") } - // process remaining attributes + + // add action and value + def value = attrs.remove('value') + def action = attrs.action ? attrs.remove('action') : value + + out << "<input type=\"submit\" name=\"_action_${action}\" value=\"${value}\" " + + // process remaining attributes outputAttributes(attrs) // close tag @@ -161,22 +173,30 @@ class FormTagLib { } /** * Creates a an image submit button that submits to an action in the controller specified by the form action - * The value of the action attribute is translated into the action name, for example "Edit" becomes - * "edit" or "List People" becomes "listPeople" + * The name of the action attribute is translated into the action name, for example "Edit" becomes + * "_action_edit" or "List People" becomes "_action_listPeople" + * If the action attribute is not specified, the value attribute will be used as part of the action name * * <g:actionSubmitImage src="/images/submitButton.gif" action="Edit" /> * */ def actionSubmitImage = { attrs -> - out << '<input type="image" name="_action" ' - def value = attrs.remove('value') - if(value) { - out << "value=\"${value}\" " + if(!attrs.value) { + throwTagError("Tag [$tagName] is missing required attribute [value]") } + + // add action and value + def value = attrs.remove('value') + def action = attrs.action ? attrs.remove('action') : value + + out << "<input type=\"image\" name=\"_action_${action}\" value=\"${value}\" " + + // add image src def src = attrs.remove('src') if(src) { out << "src=\"${src}\" " } + // process remaining attributes outputAttributes(attrs) @@ -201,6 +221,8 @@ class FormTagLib { def value = (attrs['value'] ? attrs['value'] : xdefault) def name = attrs['name'] + def id = attrs['id'] ? attrs['id'] : name + def noSelection = attrs['noSelection'] if (noSelection != null) { @@ -253,7 +275,7 @@ class FormTagLib { // create day select if (precision >= PRECISION_RANKINGS["day"]) { - out.println "<select name=\"${name}_day\">" + out.println "<select name=\"${name}_day\" id=\"${id}_day\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -272,7 +294,7 @@ class FormTagLib { // create month select if (precision >= PRECISION_RANKINGS["month"]) { - out.println "<select name=\"${name}_month\">" + out.println "<select name=\"${name}_month\" id=\"${id}_month\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -294,7 +316,7 @@ class FormTagLib { // create year select if (precision >= PRECISION_RANKINGS["year"]) { - out.println "<select name=\"${name}_year\">" + out.println "<select name=\"${name}_year\" id=\"${id}_year\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -313,7 +335,7 @@ class FormTagLib { // do hour select if (precision >= PRECISION_RANKINGS["hour"]) { - out.println "<select name=\"${name}_hour\">" + out.println "<select name=\"${name}_hour\" id=\"${id}_hour\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -338,7 +360,7 @@ class FormTagLib { // do minute select if (precision >= PRECISION_RANKINGS["minute"]) { - out.println "<select name=\"${name}_minute\">" + out.println "<select name=\"${name}_minute\" id=\"${id}_minute\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -360,7 +382,7 @@ class FormTagLib { def renderNoSelectionOption = { noSelectionKey, noSelectionValue, value -> // If a label for the '--Please choose--' first item is supplied, write it out out << '<option value="' << (noSelectionKey == null ? "" : noSelectionKey) << '"' - if(noSelectionKey == value) { + if(noSelectionKey.equals(value)) { out << ' selected="selected" ' } out << '>' << noSelectionValue.encodeAsHTML() << '</option>' @@ -388,7 +410,7 @@ class FormTagLib { } // use generic select - select( attrs ) + out << select( attrs ) } /** @@ -405,7 +427,7 @@ class FormTagLib { attrs['optionValue'] = { "${it.language}, ${it.country}, ${it.displayName}" } // use generic select - select( attrs ) + out << select( attrs ) } /** @@ -425,7 +447,7 @@ class FormTagLib { attrs.value = null } // invoke generic select - select( attrs ) + out << select( attrs ) } /** @@ -436,11 +458,15 @@ class FormTagLib { * <g:select name="user.company.id" from="${Company.list()}" value="${user?.company.id}" optionKey="id" /> */ def select = { attrs -> + def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource") + def locale = RCU.getLocale(request) + def from = attrs.remove('from') def keys = attrs.remove('keys') def optionKey = attrs.remove('optionKey') def optionValue = attrs.remove('optionValue') def value = attrs.remove('value') + def valueMessagePrefix = attrs.remove('valueMessagePrefix') def noSelection = attrs.remove('noSelection') if (noSelection != null) { noSelection = noSelection.entrySet().iterator().next() @@ -461,20 +487,21 @@ class FormTagLib { // create options from list if(from) { from.eachWithIndex { el,i -> + def keyValue = null out << '<option ' if(keys) { - out << 'value="' << keys[i] << '" ' - if(keys[i] == value) { + keyValue = keys[i] + out << 'value="' << keyValue << '" ' + if(keyValue == value) { out << 'selected="selected" ' } } - else if(optionKey) { - def keyValue = null + else if(optionKey) { if(optionKey instanceof Closure) { keyValue = optionKey(el) - out << 'value="' << keyValue << '" ' + out << 'value="' << keyValue << '" ' } - else if(el !=null && optionKey == 'id' && grailsApplication.getGrailsDomainClass(el.getClass().name)) { + else if(el !=null && optionKey == 'id' && grailsApplication.getArtefact(DomainClassArtefactHandler.TYPE, el.getClass().name)) { keyValue = el.ident() out << 'value="' << keyValue << '" ' } @@ -488,8 +515,9 @@ class FormTagLib { } } else { - out << "value=\"${el}\" " - if(el == value) { + keyValue = el + out << "value=\"${keyValue}\" " + if(keyValue == value) { out << 'selected="selected" ' } } @@ -502,6 +530,19 @@ class FormTagLib { out << el.properties[optionValue].toString().encodeAsHTML() } } + else if(valueMessagePrefix) { + def message = messageSource.getMessage("${valueMessagePrefix}.${keyValue}", null, null, locale) + if(message) { + out << message.encodeAsHTML() + } + else if (keyValue) { + out << keyValue.encodeAsHTML() + } + else { + def s = el.toString() + if(s) out << s.encodeAsHTML() + } + } else { def s = el.toString() if(s) out << s.encodeAsHTML() @@ -554,6 +595,6 @@ class FormTagLib { outputAttributes(attrs) // close the tag, with no body - out << ' ></input>' + out << ' />' } } \ No newline at end of file racetrack_ch7/plugins/core/grails-app/taglib/FormTagLib.groovy @@ -95,7 +95,7 @@ class JavascriptTagLib { } else { out.println '<script type="text/javascript">' - body() + out << body() out.println '</script>' } } @@ -137,15 +137,15 @@ class JavascriptTagLib { /** * A link to a remote uri that used the prototype library to invoke the link via ajax */ - def remoteLink = { attrs, body -> + def remoteLink = { attrs, body -> out << "<a href=\"" def cloned = deepClone(attrs) - createLink(cloned) + out << createLink(cloned) out << "\" onclick=\"" // create remote function - remoteFunction(attrs) + out << remoteFunction(attrs) attrs.remove('url') out << "return false;\" " // process remaining attributes @@ -154,7 +154,7 @@ class JavascriptTagLib { } out << ">" // output the body - body() + out << body() // close tag out << "</a>" @@ -180,7 +180,7 @@ class JavascriptTagLib { else { attrs.params = "'${paramName}='+this.value" } - remoteFunction(attrs) + out << remoteFunction(attrs) attrs.remove('params') out << "\"" attrs.remove('url') @@ -208,16 +208,16 @@ class JavascriptTagLib { // prepare form settings prepareAjaxForm(p,attrs) - def params = [ onsubmit:TagLibUtil.outToString(remoteFunction,attrs) + 'return false', + def params = [ onsubmit:remoteFunction(attrs) + 'return false', method: (attrs.method? attrs.method : 'POST' ), - action: (attrs.action? attrs.action : TagLibUtil.outToString(createLink,url)) + action: (attrs.action? attrs.action : createLink(url)) ] attrs.remove('url') params.putAll(attrs) if(params.name && !params.id) params.id = params.name - withTag(name:'form',attrs:params) { - body() + out << withTag(name:'form',attrs:params) { + out << body() } } @@ -230,7 +230,7 @@ class JavascriptTagLib { // prepare form settings attrs.forSubmitTag = ".form" prepareAjaxForm(p,attrs) - def params = [ onclick:TagLibUtil.outToString(remoteFunction,attrs) + 'return false', + def params = [ onclick:remoteFunction(attrs) + 'return false', type: 'button', name: attrs.remove('name'), value: attrs.remove('value'), @@ -238,8 +238,8 @@ class JavascriptTagLib { 'class':attrs.remove('class') ] - withTag(name:'input', attrs:params) { - body() + out << withTag(name:'input', attrs:params) { + out << body() } } @@ -275,7 +275,7 @@ class JavascriptTagLib { def sw = new StringWriter() out = new PrintWriter(out) // invoke body - body() + out << body() // restore out out = tmp js = sw.toString() @@ -357,10 +357,10 @@ class PrototypeProvider implements JavascriptProvider { def pms = attrs.remove('params') if(attrs.url) { - taglib.createLink(attrs.url) + out << taglib.createLink(attrs.url) } else { - taglib.createLink(attrs) + out << taglib.createLink(attrs) } @@ -415,6 +415,7 @@ class PrototypeProvider implements JavascriptProvider { case 'true': ajaxOptions << "${k}:${v}"; break; case 'false': ajaxOptions << "${k}:${v}"; break; case ~/\s*function(\w*)\s*/: ajaxOptions << "${k}:${v}"; break; + case ~/Insertion\..*/: ajaxOptions << "${k}:${v}"; break; default:ajaxOptions << "${k}:'${v}'"; break; } } @@ -441,10 +442,10 @@ class YahooProvider implements JavascriptProvider { out << "YAHOO.util.Connect.asyncRequest('${method}','" if(attrs.url) { - taglib.createLink(attrs.url) + out << taglib.createLink(attrs.url) } else { - taglib.createLink(attrs) + out << taglib.createLink(attrs) } attrs.remove('url') out << "'," @@ -504,7 +505,7 @@ class DojoProvider implements JavascriptProvider { } out << 'dojo.io.bind({url:\'' - taglib.createLink(attrs) + out << taglib.createLink(attrs) attrs.remove('params') out << '\',load:function(type,data,evt) {' if(attrs.onLoaded) { racetrack_ch7/plugins/core/grails-app/taglib/JavascriptTagLib.groovy @@ -25,6 +25,7 @@ import org.springframework.web.servlet.support.RequestContextUtils as RCU; import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU; class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants { + def out // to facilitate testing protected getPage() { return request[PAGE] @@ -91,7 +92,7 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants } } if(invokeBody) { - body(); + out << body() } } } @@ -134,54 +135,183 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants if(attrs.total == null) throwTagError("Tag [paginate] is missing required attribute [total]") - def mkp = new groovy.xml.MarkupBuilder(out) + def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource") + def locale = RCU.getLocale(request) + def total = attrs.total.toInteger() - def max = params.max?.toInteger() - def offset = params.offset?.toInteger() def action = (attrs.action? attrs.action : 'list') - def breadcrumb = true - if(attrs.breadcrumb) breadcrumb = Boolean.valueOf(attrs.breadcrumb) - + def offset = params.offset?.toInteger() + def max = params.max?.toInteger() + def maxsteps = (attrs.maxsteps ? attrs.maxsteps.toInteger() : 10) + + if(attrs.breadcrumb) { + log.warn("Tag [paginate] includes the [breadcrumb] attribute. This attribute is deprecated and will be removed in the future. Please update your code to use the [maxsteps] attribute instead.") + } + + if(!offset) offset = (attrs.offset ? attrs.offset.toInteger() : 0) if(!max) max = (attrs.max ? attrs.max.toInteger() : 10) - if(!offset) offset = (attrs.offset ? attrs.offset.toInteger() : 0) - def linkParams = [offset:offset-max,max:max] - def linkTagAttrs = ['class':'prevLink',action:action] + def linkParams = [offset:offset - max, max:max] + if(params.sort) linkParams.sort = params.sort + if(params.order) linkParams.order = params.order + if(attrs.params) linkParams.putAll(attrs.params) + + def linkTagAttrs = [action:action] if(attrs.controller) { linkTagAttrs.controller = attrs.controller } if(attrs.id) { linkTagAttrs.id = attrs.id } - if(attrs.params)linkParams.putAll(attrs.params) linkTagAttrs.params = linkParams - - def combined = max + offset - if(offset > 0) { - link(linkTagAttrs.clone(),{out<< (attrs.prev? attrs.prev : 'Previous' ) }) + + // determine paging variables + def steps = maxsteps > 0 + int currentstep = (offset / max) + 1 + int firststep = 1 + int laststep = Math.round(Math.ceil(total / max)) + + // display previous link when not on firststep + if(currentstep > firststep) { + linkTagAttrs.class = 'prevLink' + out << link(linkTagAttrs.clone()) { + (attrs.prev ? attrs.prev : messageSource.getMessage('default.paginate.prev', null, 'Previous', locale)) + } } - if(total > max) { - linkTagAttrs.'class' = 'step' - if(breadcrumb) { - def j = 0 - 0.step(total,max) { i -> - if(offset == i) { - mkp.a('class':'step',"${++j}") - } - else { - linkParams.offset=i - link(linkTagAttrs.clone(),{out<<++j}) - } - } + // display steps when steps are enabled and laststep is not firststep + if(steps && laststep > firststep) { + linkTagAttrs.class = 'step' + + // determine begin and endstep paging variables + int beginstep = currentstep - Math.round(maxsteps / 2) + (maxsteps % 2) + int endstep = currentstep + Math.round(maxsteps / 2) - 1 + + if(beginstep < firststep) { + beginstep = firststep + endstep = maxsteps + } + if(endstep > laststep) { + beginstep = laststep - maxsteps + 1 + if(beginstep < firststep) { + beginstep = firststep + } + endstep = laststep + } + + // display firststep link when beginstep is not firststep + if(beginstep > firststep) { + linkParams.offset = 0 + out << link(linkTagAttrs.clone()) {firststep.toString()} + out << '<span class="step">..</span>' + } + + // display paginate steps + (beginstep..endstep).each { i -> + if(currentstep == i) { + out << "<span class=\"currentStep\">${i}</span>" + } + else { + linkParams.offset = (i - 1) * max + out << link(linkTagAttrs.clone()) {i.toString()} + } + } + + // display laststep link when endstep is not laststep + if(endstep < laststep) { + out << '<span class="step">..</span>' + linkParams.offset = (laststep -1) * max + out << link(linkTagAttrs.clone()) { laststep.toString() } + } + } + + // display next link when not on laststep + if(currentstep < laststep) { + linkTagAttrs.class = 'nextLink' + linkParams.offset = offset + max + out << link(linkTagAttrs.clone()) { + (attrs.next ? attrs.next : messageSource.getMessage('default.paginate.next', null, 'Next', locale)) } } - linkParams.offset = offset+max - if(combined < total) { - linkTagAttrs.'class'='nextLink' - link(linkTagAttrs,{out<< (attrs.'next'? attrs.'next' : 'Next' )}) + + } + + /** + * Renders a sortable column to support sorting in list views + * + * Attributes: + * + * property - name of the property relating to the field + * defaultOrder (optional) - default order for the property; choose between asc (default if not provided) and desc + * title (optional*) - title caption for the column + * titleKey (optional*) - title key to use for the column, resolved against the message source + * params (optional) - a map containing request parameters + * + * Attribute title or titleKey is required. When both attributes are specified then titleKey takes precedence, + * resulting in the title caption to be resolved against the message source. In case when the message could + * not be resolved, the title will be used as title caption. + * + * Examples: + * + * <g:sortableColumn property="title" title="Title" /> + * <g:sortableColumn property="title" title="Title" style="width: 200px" /> + * <g:sortableColumn property="title" titleKey="book.title" /> + * <g:sortableColumn property="releaseDate" defaultOrder="desc" title="Release Date" /> + * <g:sortableColumn property="releaseDate" defaultOrder="desc" title="Release Date" titleKey="book.releaseDate" /> + */ + def sortableColumn = { attrs -> + + if(!attrs.property) + throwTagError("Tag [sortableColumn] is missing required attribute [property]") + + if(!attrs.title && !attrs.titleKey) + throwTagError("Tag [sortableColumn] is missing required attribute [title] or [titleKey]") + + def property = attrs.remove("property") + def action = attrs.action ? attrs.remove("action") : "list" + + def defaultOrder = attrs.remove("defaultOrder") + if(defaultOrder != "desc") defaultOrder = "asc" + + // current sorting property and order + def sort = params.sort + def order = params.order + + // add sorting property and params to link params + def linkParams = [sort:property] + if(attrs.params) linkParams.putAll(attrs.params) + + // determine and add sorting order for this column to link params + attrs.class = "sortable" + if(property == sort) { + attrs.class = attrs.class + " sorted " + order + if(order == "asc") { + linkParams.order = "desc" + } + else { + linkParams.order = "asc" + } + } + else { + linkParams.order = defaultOrder + } + + // determine column title + def title = attrs.remove("title") + def titleKey = attrs.remove("titleKey") + if(titleKey) { + if(!title) title = titleKey + def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource") + def locale = RCU.getLocale(request) + title = messageSource.getMessage(titleKey, null, title, locale) } + out << "<th " + // process remaining attributes + attrs.each { k, v -> + out << "${k}=\"${v.encodeAsHTML()}\" " + } + out << ">${link(action:action, params:linkParams) { title }}</th>" } /** @@ -199,14 +329,7 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants def uri = grailsAttributes.getTemplateUri(attrs.template,request) def var = attrs['var'] - def url = servletContext.getResource(uri) - if(!url) - throwTagError("No template found for name [${attrs.template}] in tag [render]") - - def t = engine.createTemplate( uri, - servletContext, - request, - response) + def t = engine.createTemplate( uri ) if(attrs.model instanceof Map) { t.make( attrs.model ).writeTo(out) @@ -246,14 +369,7 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants def engine = grailsAttributes.getPagesTemplateEngine() def uri = grailsAttributes.getTemplateUri(attrs.template,request) - def url = servletContext.getResource(uri) - if(!url) - throwTagError("No template found for name [${attrs.template}] in tag [include]") - - def t = engine.createTemplate( uri, - servletContext, - request, - response) + def t = engine.createTemplate( uri ) t.make().writeTo(out) } racetrack_ch7/plugins/core/grails-app/taglib/RenderTagLib.groovy @@ -152,7 +152,7 @@ class UITagLib { * <g:richTextEditor name="editor" height="400" /> */ def richTextEditor = { attrs -> - withTag(name:'script',attributes:[type:'text/javascript']) { + out << withTag(name:'script',attributes:[type:'text/javascript']) { if(attrs.onComplete) { out.println "function FCKeditor_OnComplete( editorInstance ) {" out.println "${attrs.onComplete}(editorInstance);" @@ -162,24 +162,53 @@ class UITagLib { var oFCKeditor = new FCKeditor( '${attrs.name}' ) ; oFCKeditor.BasePath = \"""" if(attrs.basepath) { - createLinkTo(dir:attrs.basepath) + out << createLinkTo(dir:attrs.basepath) } else { - createLinkTo(dir:"fckeditor/") + out << createLinkTo(dir:"fckeditor/") } out.println '";' if(attrs.toolbar) { out << "oFCKeditor.ToolbarSet = '${attrs.toolbar}';" - } + } + // add width support + if(attrs.width) + out.println "oFCKeditor.Width = '${attrs.width}';" + if(attrs.height) - out.println "oFCKeditor.Height = ${attrs.height};" + out.println "oFCKeditor.Height = '${attrs.height}';" + + // add skin support, values to choose: "default", "office2003", "silver" + if(attrs.skin) + out.println "oFCKeditor.Config['SkinPath'] = 'skins/${attrs.skin}/';" + + // check the browser compatibility when rendering the editor. default value: true, values to choose: true, false, + if(attrs.checkBrowser) + out.println "oFCKeditor.CheckBrowser = ${attrs.checkBrowser};" + + // show error messages on errors while rendering the editor. default value: true, values to choose: true, false + if(attrs.displayErrors) + out.println "oFCKeditor.DisplayErrors = ${attrs.displayErrors};" + + // oFCKeditor.Config AutoDetectLanguage:true/false, DefaultLanguage:'pt-BR' and so on + if(attrs.config) { + if (attrs.config instanceof Map) { + attrs.config.each { k, v -> + out.println "oFCKeditor.Config['$k'] = '$v';" + } + } else { + throw new Exception("""The format of config is not correct, it should be like "[AutoDetectLanguage:false, DefaultLanguage:'pt-BR']" """) + } + } + if(attrs.value) { out << "oFCKeditor.Value = \"" - escapeJavascript(Collections.EMPTY_MAP,attrs.value) + out << escapeJavascript(Collections.EMPTY_MAP,attrs.value) out.println "\" ;" } - out.println "oFCKeditor.Create();" + out.println "oFCKeditor.Create();" + } } } \ No newline at end of file racetrack_ch7/plugins/core/grails-app/taglib/UITagLib.groovy @@ -32,9 +32,7 @@ class ValidationTagLib { def model = attrs['model'] def checkList = [] if(model) { - checkList = model.findAll { k,v -> - return ((v.errors != null) && (v.errors instanceof Errors)) - } + checkList = model.findAll { it.value?.errors instanceof Errors }.collect { it.value } } if(attrs['bean']) { checkList << attrs['bean'] @@ -45,7 +43,7 @@ class ValidationTagLib { if(ra) { if(ra instanceof Errors) checkList << ra - else if ((ra.properties.errors) && (ra.errors instanceof Errors)) { + else if (ra.properties?.errors instanceof Errors) { checkList << ra } } @@ -55,23 +53,29 @@ class ValidationTagLib { for(i in checkList) { def errors = null - if(i instanceof Errors) { + if (i instanceof Errors) { errors = i } - else { - if ((i.errors != null) && (i.errors instanceof Errors)) { - if (i.hasErrors()) - errors = i.errors - } + else { + try { + if ((i.errors != null) && (i.errors instanceof Errors)) { + if (i.hasErrors()) + errors = i.errors + } + + } + catch(MissingPropertyException mpe) { + // ignore + } } if(errors) { if(attrs['field']) { if(errors.hasFieldErrors(attrs['field'])) { - body() + out << body() } } else { - body() + out << body() } } } @@ -84,9 +88,7 @@ class ValidationTagLib { def model = attrs['model'] def errorList = [] if(model) { - errorList = model.findAll { k,v -> - return ((v.errors != null) && (v.errors instanceof Errors)) - } + errorList = model.findAll { it.value?.errors instanceof Errors }.collect { it.value } } if(attrs['bean']) { errorList << attrs['bean'] @@ -95,9 +97,9 @@ class ValidationTagLib { request.attributeNames.each { def ra = request[it] if(ra) { - if(ra instanceof Errors) + if (ra instanceof Errors) errorList << ra - else if ((ra.errors != null) && (ra.errors instanceof Errors)) { + else if (ra.properties?.errors instanceof Errors) { errorList << ra } } @@ -119,13 +121,13 @@ class ValidationTagLib { if(attrs['field']) { if(errors.hasFieldErrors(attrs['field'])) { errors.getFieldErrors( attrs["field"] ).each { - body(it) + out << body(it) } } } else { errors.allErrors.each { - body( it ) + out << body( it ) } } } @@ -141,9 +143,9 @@ class ValidationTagLib { if(renderAs == 'list') { out << "<ul>" - eachError(attrs, { + out << eachError(attrs, { out << "<li>" - message(error:it) + out << message(error:it) out << "</li>" } ) @@ -219,7 +221,7 @@ class ValidationTagLib { } def app = grailsAttributes.getGrailsApplication() - def dc = app.getGrailsDomainClass(againstClass) + def dc = app.getDomainClass(againstClass) if(!dc) throwTagError("Tag [validate] could not find a domain class to validate against for name [${againstClass}]") racetrack_ch7/plugins/core/grails-app/taglib/ValidationTagLib.groovy @@ -8,7 +8,7 @@ class URLCodec { } static decode = { obj -> - URLEncoder.decode(obj.toString(), URLCodec.getEncoding()) + URLDecoder.decode(obj.toString(), URLCodec.getEncoding()) } private static def getEncoding() { racetrack_ch7/plugins/core/grails-app/utils/URLCodec.groovy @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> - -<beans> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> </beans> \ No newline at end of file racetrack_ch7/spring/resources.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> -<beans> <bean id="grailsApplication" class="org.codehaus.groovy.grails.commons.GrailsApplicationFactoryBean"> <description>Grails application factory bean</description> <property name="groovyFiles"> @@ -25,7 +27,7 @@ <property name="pluginManager" ref="pluginManager" /> </bean> - <bean id="grailsResourceHolder" singleton="false" class="org.codehaus.groovy.grails.commons.spring.GrailsResourceHolder"> + <bean id="grailsResourceHolder" scope="prototype" class="org.codehaus.groovy.grails.commons.spring.GrailsResourceHolder"> <property name="resources"> <value>classpath*:**/grails-app/**/*.groovy</value> </property> racetrack_ch7/web-app/WEB-INF/applicationContext.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> - -<beans> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> </beans> \ No newline at end of file racetrack_ch7/web-app/WEB-INF/spring/resources.xml @@ -10,6 +10,254 @@ <uri>http://grails.codehaus.org/tags</uri> <tag> + <description> + Enables the storing of a value into the given ${var} + </description> + <name>set</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovySetTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The value to store</description> + <name>value</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The name of the variable to store the value in</description> + <name>var</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Enables the storing of a value into the given ${var} into the page context + </description> + <name>def</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyDefTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The value to store</description> + <name>value</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The name of the variable to store the value in</description> + <name>var</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Logical if tag to test whether the given condition is true + </description> + <name>if</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyIfTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The condition to test</description> + <name>test</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Logical else tag as fallback if the if condition fails + </description> + <name>else</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyElseTag</tag-class> + <body-content>JSP</body-content> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Logical elseif tag to test whether the given condition is true + </description> + <name>elseif</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyElseIfTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The condition to test</description> + <name>test</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Tag to loop over a collection while the test expression returns true + </description> + <name>while</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyWhileTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The condition to test</description> + <name>test</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection</description> + <name>each</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyEachTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>true</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection</description> + <name>findAll</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyFindAllTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The expression to filter the elements to iterate over</description> + <name>expr</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>true</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection and collects the elements + you want to work with</description> + <name>collect</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyCollectTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The expression to use to collect the elements. The + expression must retur true to add the element to the + collection</description> + <name>expr</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection and filters the elements + with a regular expression</description> + <name>grep</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyGrepTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The regular expression to filter the element with. The + filter is a simple Groovy Regex</description> + <name>filter</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description>A tag that attempts to render an input for a bean property + into an appropriate component based on the type. It uses the templates + defined in "grails-app/views/scaffolding" to achieve this by looking up + the template by type.</description> + <name>renderInput</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyRenderInputTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The Bean to render the input for</description> + <name>bean</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The property of the bean to render input for</description> + <name>property</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> <name>link</name> <tag-class>org.codehaus.groovy.grails.web.taglib.jsp.JspLinkTag</tag-class> <body-content>JSP</body-content> racetrack_ch7/web-app/WEB-INF/tld/grails.tld @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" racetrack_ch7/web-app/WEB-INF/web.template.xml @@ -1 +1 @@ -<web-app xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd' version='2.4' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://java.sun.com/xml/ns/j2ee'><context-param><param-name>log4jConfigLocation</param-name><param-value>/WEB-INF/classes/log4j.properties</param-value></context-param><context-param><param-name>contextConfigLocation</param-name><param-value>/WEB-INF/applicationContext.xml</param-value></context-param><context-param><param-name>webAppRootKey</param-name><param-value>racetrack</param-value></context-param><filter><filter-name>sitemesh</filter-name><filter-class>org.codehaus.groovy.grails.web.sitemesh.GrailsPageFilter</filter-class></filter><filter><filter-name>charEncodingFilter</filter-name><filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class><init-param><param-name>targetBeanName</param-name><param-value>characterEncodingFilter</param-value></init-param><init-param><param-name>targetFilterLifecycle</param-name><param-value>true</param-value></init-param></filter><filter><filter-name>grailsWebRequest</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequestFilter</filter-class></filter><filter-mapping><filter-name>charEncodingFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>grailsWebRequest</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>sitemesh</filter-name><url-pattern>/*</url-pattern></filter-mapping><listener><listener-class>org.springframework.web.util.Log4jConfigListener</listener-class></listener><listener><listener-class>org.codehaus.groovy.grails.web.context.GrailsContextLoaderListener</listener-class></listener><servlet><servlet-name>grails</servlet-name><servlet-class>org.codehaus.groovy.grails.web.servlet.GrailsDispatcherServlet</servlet-class><load-on-startup>1</load-on-startup></servlet><servlet><servlet-name>gsp</servlet-name><servlet-class>org.codehaus.groovy.grails.web.pages.GroovyPagesServlet</servlet-class></servlet><servlet-mapping><servlet-name>gsp</servlet-name><url-pattern>*.gsp</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>/base/*</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>/user/*</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>/registration/*</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>/race/*</url-pattern></servlet-mapping><welcome-file-list><welcome-file>index.jsp</welcome-file><welcome-file>index.gsp</welcome-file></welcome-file-list><jsp-config><taglib><taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri><taglib-location>/WEB-INF/tld/c.tld</taglib-location></taglib><taglib><taglib-uri>http://java.sun.com/jsp/jstl/fmt</taglib-uri><taglib-location>/WEB-INF/tld/fmt.tld</taglib-location></taglib><taglib><taglib-uri>http://www.springframework.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/spring.tld</taglib-location></taglib><taglib><taglib-uri>http://grails.codehaus.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/grails.tld</taglib-location></taglib></jsp-config></web-app> \ No newline at end of file +<web-app xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd' version='2.4' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://java.sun.com/xml/ns/j2ee'><context-param><param-name>log4jConfigLocation</param-name><param-value>/WEB-INF/classes/log4j.properties</param-value></context-param><context-param><param-name>contextConfigLocation</param-name><param-value>/WEB-INF/applicationContext.xml</param-value></context-param><context-param><param-name>webAppRootKey</param-name><param-value>racetrack</param-value></context-param><filter><filter-name>sitemesh</filter-name><filter-class>org.codehaus.groovy.grails.web.sitemesh.GrailsPageFilter</filter-class></filter><filter><filter-name>charEncodingFilter</filter-name><filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class><init-param><param-name>targetBeanName</param-name><param-value>characterEncodingFilter</param-value></init-param><init-param><param-name>targetFilterLifecycle</param-name><param-value>true</param-value></init-param></filter><filter><filter-name>grailsWebRequest</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequestFilter</filter-class></filter><filter><filter-name>urlMapping</filter-name><filter-class>org.codehaus.groovy.grails.web.mapping.filter.UrlMappingsFilter</filter-class></filter><filter-mapping><filter-name>charEncodingFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>grailsWebRequest</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>sitemesh</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>urlMapping</filter-name><url-pattern>/*</url-pattern></filter-mapping><listener><listener-class>org.springframework.web.util.Log4jConfigListener</listener-class></listener><listener><listener-class>org.codehaus.groovy.grails.web.context.GrailsContextLoaderListener</listener-class></listener><servlet><servlet-name>grails</servlet-name><servlet-class>org.codehaus.groovy.grails.web.servlet.GrailsDispatcherServlet</servlet-class><load-on-startup>1</load-on-startup></servlet><servlet><servlet-name>gsp</servlet-name><servlet-class>org.codehaus.groovy.grails.web.pages.GroovyPagesServlet</servlet-class></servlet><servlet-mapping><servlet-name>gsp</servlet-name><url-pattern>*.gsp</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>*.dispatch</url-pattern></servlet-mapping><welcome-file-list><welcome-file>index.jsp</welcome-file><welcome-file>index.gsp</welcome-file></welcome-file-list><jsp-config><taglib><taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri><taglib-location>/WEB-INF/tld/c.tld</taglib-location></taglib><taglib><taglib-uri>http://java.sun.com/jsp/jstl/fmt</taglib-uri><taglib-location>/WEB-INF/tld/fmt.tld</taglib-location></taglib><taglib><taglib-uri>http://www.springframework.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/spring.tld</taglib-location></taglib><taglib><taglib-uri>http://grails.codehaus.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/grails.tld</taglib-location></taglib></jsp-config></web-app> \ No newline at end of file racetrack_ch7/web-app/WEB-INF/web.xml @@ -124,4 +124,15 @@ td .errors { .prop .value { text-align:left; width:80%; +} + +.prevLink, .step, .currentStep, .nextLink { + padding-right: 5px; +} +.currentStep { + font-weight:bold; +} + +th.sorted a, th.sorted a:link, th.sorted a:visited, th.sorted a:hover, th.sortable a, th.sortable a:link, th.sortable a:visited, th.sortable a:hover { + color: white; } \ No newline at end of file racetrack_ch7/web-app/css/main.css @@ -1,7 +1,7 @@ function warnBeforeRaceDelete() { return confirm('Are you sure you want to delete this race?') -} +} function warnBeforeRegistrationDelete() { return confirm('Are you sure you want to delete this registration?') -} \ No newline at end of file +} racetrack_ch7/web-app/js/racetrack.js @@ -10,7 +10,9 @@ <classpathentry kind="src" path="grails-tests"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="var" path="GRAILS_HOME/ant/lib/ant.jar"/> - <classpathentry kind="var" path="GRAILS_HOME/lib/ant-nodeps.jar" /> + <classpathentry kind="var" path="GRAILS_HOME/lib/ant-junit.jar" /> + +<classpathentry kind="var" path="GRAILS_HOME/lib/ant-nodeps.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/ant.jar" /> @@ -48,9 +50,9 @@ <classpathentry kind="var" path="GRAILS_HOME/lib/ejb3-persistence.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/gant-0.2.2-SNAPSHOT.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/gant-0.2.5-SNAPSHOT.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/groovy-all-1.0.1-SNAPSHOT.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/groovy-all-1.1-BETA-1.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/groovy-starter.jar" /> @@ -80,13 +82,13 @@ <classpathentry kind="var" path="GRAILS_HOME/lib/log4j-1.2.8.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/ognl-2.7.jar" /> - <classpathentry kind="var" path="GRAILS_HOME/lib/org.mortbay.jetty.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/oro-2.0.8.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/lib/quartz-1.5.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/quartz-1.6.0.jar" /> + +<classpathentry kind="var" path="GRAILS_HOME/lib/serializer.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/servletapi-2.4.jar" /> @@ -106,18 +108,20 @@ <classpathentry kind="var" path="GRAILS_HOME/lib/standard-2.4.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/lib/xalan.jar" /> + <classpathentry kind="var" path="GRAILS_HOME/lib/xerces-2.6.2.jar" /> <classpathentry kind="var" path="GRAILS_HOME/lib/xml-apis.jar" /> - <classpathentry kind="var" path="GRAILS_HOME/dist/grails-core-0.4.2.jar" /> + <classpathentry kind="var" path="GRAILS_HOME/dist/grails-core-0.5.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/dist/grails-crud-0.4.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/dist/grails-crud-0.5.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/dist/grails-gorm-0.4.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/dist/grails-gorm-0.5.jar" /> -<classpathentry kind="var" path="GRAILS_HOME/dist/grails-web-0.4.2.jar" /> +<classpathentry kind="var" path="GRAILS_HOME/dist/grails-web-0.5.jar" /> <classpathentry kind="output" path="web-app/WEB-INF/classes"/> racetrack_ch8/.classpath @@ -1,2 +1,2 @@ -2007-03-11 21:30:49,103 WARN [UserController] Shields up! Somebody's trying to hack through our rock-solid DEFCON 1 security -- User ID - admin, Password - +2007-05-19 16:47:28,583 WARN [grails.app.controller.UserController] Shields up! Somebody's trying to hack through our rock-solid DEFCON 1 security -- User ID - adminjoe, Password - letmein \ No newline at end of file racetrack_ch8/access.log @@ -1,4 +1,4 @@ -#Do not edit app.grails.* properties, they may change automatically. DO NOT put application configuration in here, it is not the right place! -#Sun Mar 11 15:49:46 EDT 2007 -app.grails.version=0.4.2 +#Wed May 02 20:22:50 EDT 2007 +app.version=0.1 +app.grails.version=0.5 app.name=racetrack racetrack_ch8/application.properties @@ -1,11 +1,12 @@ -class ApplicationBootStrap { - def init = { servletContext -> +class ApplicationBootStrap { + + def init = { servletContext -> final String BACKUP_ADMIN = 'adminjoe' if (!User.findByUserId(BACKUP_ADMIN)) { new User(userId:BACKUP_ADMIN,password:'password').save() } - } - - def destroy = { - } -} + } + + def destroy = { + } +} \ No newline at end of file racetrack_ch8/grails-app/conf/ApplicationBootStrap.groovy @@ -1,8 +1,8 @@ -class DevelopmentDataSource { +class DevelopmentDataSource { boolean pooling = true String dbCreate = "update" String url = "jdbc:mysql://localhost/racetrack_dev" String driverClassName = "com.mysql.jdbc.Driver" String username = "jason" String password = "" -} +} racetrack_ch8/grails-app/conf/DevelopmentDataSource.groovy @@ -4,5 +4,5 @@ class ProductionDataSource { String url = "jdbc:mysql://localhost/racetrack_prod" String driverClassName = "com.mysql.jdbc.Driver" String username = "prod" - String password = "wahoowa" -} + String password = "wahoowa" +} \ No newline at end of file racetrack_ch8/grails-app/conf/ProductionDataSource.groovy @@ -1,8 +1,8 @@ -class TestDataSource { - boolean pooling = true +class TestDataSource { + boolean pooling = true String dbCreate = "update" String url = "jdbc:mysql://localhost/racetrack_test" String driverClassName = "com.mysql.jdbc.Driver" String username = "jason" - String password = "" -} + String password = "" +} racetrack_ch8/grails-app/conf/TestDataSource.groovy @@ -4,7 +4,28 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.rootLogger=error, stdout -# Enable this logger to log Hibernate output +# This logger is for your own application artefact logs +# Artefacts are logged by their type and optionally class name i.e: +# +# log4j.logger.grails.app.controller.HelloController=debug, stdout +# ...will control the logs from just that controller +# +# log4j.logger.grails.app.domain=trace, stdout +# ...will control the logs for all domain classes +# +# At the time of writing, supported artefact type ids include: +# domain (aka Domain Class), task (aka Job), service, dataSource, +# controller, tagLib, urlMappings, codec, bootstrap +# +# The default "info" level for all artefacts is set here +log4j.logger.grails.app=info,stdout +log4j.additivity.grails.app=false + +## This logger is for Grails' public APIs within the grails. package +log4j.logger.grails=info,stdout +log4j.additivity.grails=false + +## Enable this logger to log Hibernate output # handy to see its database interaction activity #log4j.logger.org.hibernate=debug,stdout #log4j.additivity.org.hibernate=false @@ -37,7 +58,3 @@ log4j.logger.org.codehaus.groovy.grails.plugins=info,stdout log4j.additivity.org.codehaus.groovy.grails.plugins=false log4j.logger.grails.spring=info,stdout log4j.additivity.grails.spring=false - -# This logger is for Grails' public APIs within the grails. package -log4j.logger.grails=info,stdout -log4j.additivity.grails=false racetrack_ch8/grails-app/conf/log4j.development.properties @@ -4,7 +4,28 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.rootLogger=error, stdout -# Enable this logger to log Hibernate output +# This logger is for your own application artefact logs +# Artefacts are logged by their type and optionally class name i.e: +# +# log4j.logger.grails.app.controller.HelloController=debug, stdout +# ...will control the logs from just that controller +# +# log4j.logger.grails.app.domain=trace, stdout +# ...will control the logs for all domain classes +# +# At the time of writing, supported artefact type ids include: +# domain (aka Domain Class), task (aka Job), service, dataSource, +# controller, tagLib, urlMappings, codec, bootstrap +# +# The default "info" level for all artefacts is set here +log4j.logger.grails.app=info,stdout +log4j.additivity.grails.app=false + +## This logger is for Grails' public APIs within the grails. package +log4j.logger.grails=info,stdout +log4j.additivity.grails=false + +## Enable this logger to log Hibernate output # handy to see its database interaction activity #log4j.logger.org.hibernate=debug,stdout #log4j.additivity.org.hibernate=false @@ -38,15 +59,10 @@ log4j.additivity.org.codehaus.groovy.grails.plugins=false log4j.logger.grails.spring=info,stdout log4j.additivity.grails.spring=false -# This logger is for Grails' public APIs within the grails. package -log4j.logger.grails=info,stdout -log4j.additivity.grails=false - log4j.appender.access=org.apache.log4j.FileAppender log4j.appender.access.file=access.log log4j.appender.access.layout=org.apache.log4j.PatternLayout log4j.appender.access.layout.ConversionPattern=%d %p %x [%c] %m%n -log4j.logger.UserController=warn,access -log4j.additivity.UserController=false - +log4j.logger.grails.app.controller.UserController=warn,access +log4j.additivity.grails.app.controller.UserController=false \ No newline at end of file racetrack_ch8/grails-app/conf/log4j.production.properties @@ -4,7 +4,28 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.rootLogger=error, stdout -# Enable this logger to log Hibernate output +# This logger is for your own application artefact logs +# Artefacts are logged by their type and optionally class name i.e: +# +# log4j.logger.grails.app.controller.HelloController=debug, stdout +# ...will control the logs from just that controller +# +# log4j.logger.grails.app.domain=trace, stdout +# ...will control the logs for all domain classes +# +# At the time of writing, supported artefact type ids include: +# domain (aka Domain Class), task (aka Job), service, dataSource, +# controller, tagLib, urlMappings, codec, bootstrap +# +# The default "info" level for all artefacts is set here +log4j.logger.grails.app=info,stdout +log4j.additivity.grails.app=false + +## This logger is for Grails' public APIs within the grails. package +log4j.logger.grails=info,stdout +log4j.additivity.grails=false + +## Enable this logger to log Hibernate output # handy to see its database interaction activity #log4j.logger.org.hibernate=debug,stdout #log4j.additivity.org.hibernate=false @@ -37,7 +58,3 @@ log4j.logger.org.codehaus.groovy.grails.plugins=info,stdout log4j.additivity.org.codehaus.groovy.grails.plugins=false log4j.logger.grails.spring=info,stdout log4j.additivity.grails.spring=false - -# This logger is for Grails' public APIs within the grails. package -log4j.logger.grails=info,stdout -log4j.additivity.grails=false racetrack_ch8/grails-app/conf/log4j.test.properties @@ -2,11 +2,13 @@ abstract class BaseController { def auth() { if(!session.userId) { def originalRequestParams = [controller:controllerName, action:actionName] + originalRequestParams.putAll(params) + session.originalRequestParams = originalRequestParams redirect(controller:'user',action:'login') return false } - } -} \ No newline at end of file + } +} \ No newline at end of file racetrack_ch8/grails-app/controllers/BaseController.groovy @@ -1,6 +1,6 @@ -class RaceController extends BaseController { - def beforeInterceptor = [action:this.&auth, except:['search']] +class RaceController extends BaseController { + def beforeInterceptor = [action:this.&auth, except:['search']] def index = { redirect(action:list,params:params) } @@ -48,8 +48,8 @@ class RaceController extends BaseController { def race = Race.get( params.id ) if(race) { race.properties = params - if(race.save()) { - flash.message = "${params.name} updated." + if(race.save()) { + flash.message = "${params.name} updated." redirect(action:show,id:race.id) } else { @@ -72,7 +72,7 @@ class RaceController extends BaseController { def race = new Race() race.properties = params if(race.save()) { - flash.message = "${params.name} saved." + flash.message = "${params.name} saved." redirect(action:show,id:race.id) } else { @@ -80,42 +80,41 @@ class RaceController extends BaseController { } } - def search = { - if (request.method == 'POST') { - RaceQuery query = new RaceQuery() - bindData(query, params) - - def criteria = Race.createCriteria() - - def results = criteria { - and { - like('city', '%' + query.city + '%') - like('state', '%' + query.state + '%') - if (query.distance) { - switch (query.distanceOperator) { - case RaceQuery.DistanceOperator.AT_LEAST: - ge('distance', query.distance) - break - case RaceQuery.DistanceOperator.EXACTLY: - eq('distance', query.distance) - break - case RaceQuery.DistanceOperator.AT_MOST: - le('distance', query.distance) - break - default: - log.error "Found unexpected value for distance" - + " operator - ${query.distanceOperator}" - } - } - // Add 1 day (24 hours) to the max date. (If user selects a max - // date of Jan 1st, the date object will hold Jan 1st 00:00, but - // the user will want any events occurring thru Jan 1st 23:59.) - between('startDateTime', query.minDate, query.maxDate + 1) - } - } - - render(view:'searchresults', model:[ raceList: results ]) - } - } - + def search = { + if (request.method == 'POST') { + RaceQuery query = new RaceQuery() + bindData(query, params) + + def criteria = Race.createCriteria() + + def results = criteria { + and { + like('city', '%' + query.city + '%') + like('state', '%' + query.state + '%') + if (query.distance) { + switch (query.distanceOperator) { + case RaceQuery.DistanceOperator.AT_LEAST: + ge('distance', query.distance) + break + case RaceQuery.DistanceOperator.EXACTLY: + eq('distance', query.distance) + break + case RaceQuery.DistanceOperator.AT_MOST: + le('distance', query.distance) + break + default: + log.error "Found unexpected value for distance" + + " operator - ${query.distanceOperator}" + } + } + // Add 1 day (24 hours) to the max date. If user selects a max + // date of Jan 1st, the date object will hold Jan 1st 00:00, but + // the user will want any events occurring thru Jan 1st 23:59. + between('startDateTime', query.minDate, query.maxDate + 1) + } + } + + render(view:'searchresults', model:[ raceList: results.adaptee ]) + } + } } \ No newline at end of file racetrack_ch8/grails-app/controllers/RaceController.groovy @@ -1,6 +1,6 @@ -class RegistrationController extends BaseController { - def beforeInterceptor = [action:this.&auth, except:'register'] +class RegistrationController extends BaseController { + def beforeInterceptor = [action:this.&auth, except:'register'] def index = { redirect(action:list,params:params) } @@ -49,7 +49,7 @@ class RegistrationController extends BaseController { if(registration) { registration.properties = params if(registration.save()) { - flash.message = "${params.name} updated." + flash.message = "${params.name} updated." redirect(action:show,id:registration.id) } else { @@ -72,7 +72,7 @@ class RegistrationController extends BaseController { def registration = new Registration() registration.properties = params if(registration.save()) { - flash.message = "${params.name} saved." + flash.message = "${params.name} saved." redirect(action:show,id:registration.id) } else { @@ -80,6 +80,7 @@ class RegistrationController extends BaseController { } } + def register = { def registration = new Registration() registration.properties = params @@ -90,8 +91,7 @@ class RegistrationController extends BaseController { } else { if(registration.save()) { - flash.message = - "Successfully registered for ${registration.race.name}" + flash.message = "Successfully registered for ${registration.race.name}" redirect(controller:'race',action:'search') } else { @@ -99,5 +99,5 @@ class RegistrationController extends BaseController { return ['registration':registration,'race':race] } } - } + } } \ No newline at end of file racetrack_ch8/grails-app/controllers/RegistrationController.groovy @@ -1,7 +1,7 @@ class UserController extends BaseController { def beforeInterceptor = [action:this.&auth, except:['login', 'logout']] - + def index = { redirect(action:list,params:params) } // the delete, save and update actions only racetrack_ch8/grails-app/controllers/UserController.groovy @@ -1,4 +1,4 @@ -class Race { +class Race { String name Date startDateTime String city @@ -7,16 +7,16 @@ class Race { Float cost Integer maxRunners = 100000 - static hasMany = [registrations:Registration] + static hasMany = [registrations:Registration] static constraints = { - name(maxLength:50,blank:false) - startDateTime(validator: {return (it > new Date())}) - city(maxLength:30,blank:false) + name(maxSize:50,blank:false) + startDateTime(validator: {return (it > new Date())}) + city(maxSize:30,blank:false) state(inList:['GA', 'NC', 'SC', 'VA'],blank:false) distance(min:3.1f,max:100f) cost(min:0f,max:999.99f) - } + } - String toString() {"${this.name} : ${this.city}, ${this.state}"} -} \ No newline at end of file + String toString() {"${this.name} : ${this.city}, ${this.state}" } +} racetrack_ch8/grails-app/domain/Race.groovy @@ -1,4 +1,4 @@ -class Registration { +class Registration { Race race String name Date dateOfBirth @@ -6,19 +6,17 @@ class Registration { String postalAddress String emailAddress Date createdAt = new Date() - + static belongsTo = Race - - static optionals = ["postalAddress" ] - + static constraints = { - name(maxLength:50,blank:false) + name(maxSize:50,blank:false) dateOfBirth(nullable:false) gender(inList:["M", "F"]) - postalAddress(maxLength:255) - emailAddress(maxLength:50,email:true) + postalAddress(nullable:true,maxSize:255) + emailAddress(maxSize:50,email:true) race(nullable:false) } - - String toString() {"${this.name} : ${this.emailAddress}"} -} \ No newline at end of file + + String toString(){"${this.name}:${this.emailAddress}"} +} racetrack_ch8/grails-app/domain/Registration.groovy @@ -3,7 +3,7 @@ class User { String password static constraints = { - userId(length:6..8,unique:true) - password(length:6..8) + userId(size:6..8,unique:true) + password(size:6..8) } } \ No newline at end of file racetrack_ch8/grails-app/domain/User.groovy @@ -1,29 +1,28 @@ default.doesnt.match.message=Property [{0}] of class [{1}] with value [{2}] does not match the required pattern [{3}] default.invalid.url.message=Property [{0}] of class [{1}] with value [{2}] is not a valid URL default.invalid.creditCard.message=Property [{0}] of class [{1}] with value [{2}] is not a valid credit card number -default.invalid.email.message=Property [{0}] of class [{1}] with value [{2}] is not a valid e-mail address. -default.invalid.message=Property [{0}] of class [{1}] is not a valid [{2}]. +default.invalid.email.message=Property [{0}] of class [{1}] with value [{2}] is not a valid e-mail address default.invalid.range.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid range from [{3}] to [{4}] default.invalid.size.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid size range from [{3}] to [{4}] -default.invalid.length.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid size range from [{3}] to [{4}] -default.invalid.min.message=Property [{0}] of class [{1}] with value [{2}] is less than minimum value [{3}] default.invalid.max.message=Property [{0}] of class [{1}] with value [{2}] exceeds maximum value [{3}] -default.invalid.max.length.message=Property [{0}] of class [{1}] with value [{2}] exceeds the maximum size of [{3}] -default.invalid.min.length.message=Property [{0}] of class [{1}] with value [{2}] is less than the minimum size of [{3}] +default.invalid.min.message=Property [{0}] of class [{1}] with value [{2}] is less than minimum value [{3}] default.invalid.max.size.message=Property [{0}] of class [{1}] with value [{2}] exceeds the maximum size of [{3}] default.invalid.min.size.message=Property [{0}] of class [{1}] with value [{2}] is less than the minimum size of [{3}] +default.invalid.validator.message=Property [{0}] of class [{1}] with value [{2}] does not pass custom validation default.not.inlist.message=Property [{0}] of class [{1}] with value [{2}] is not contained within the list [{3}] default.blank.message=Property [{0}] of class [{1}] cannot be blank default.not.equal.message=Property [{0}] of class [{1}] with value [{2}] cannot equal [{3}] default.null.message=Property [{0}] of class [{1}] cannot be null default.not.unique.message=Property [{0}] of class [{1}] with value [{2}] must be unique -default.not.editable.message=Property [{0}] of class [{1}] with value [{2}] cannot be changed from [{3}] -race.name.blank=Please enter a name for this race +default.paginate.prev=Previous +default.paginate.next=Next + +race.name.blank=Please enter a name for this race race.distance.max.exceeded=Please enter a valid distance no more than {3} miles race.startDateTime.validator.invalid=Please enter a future date and time race.city.blank=Please enter a city for this race -race.city.maxLength.exceeded=Please limit the city name to a maximum length of {3} characters +race.city.maxSize.exceeded=Please limit the city name to a maximum length of {3} characters race.distance.nullable=Please enter a valid distance race.distance.min.notmet=Please enter a valid distance no fewer than {3} miles race.distance.max.exceeded=Please enter a valid distance no more than {3} miles @@ -32,8 +31,8 @@ race.cost.min.notmet=Please enter a valid cost of at least ${3} race.cost.max.exceeded=Please enter a valid cost no more than ${3} registration.name.blank=Please enter a name -registration.name.maxLength.exceeded=Please limit the name to a maximum length of {3} characters -registration.postalAddress.maxLength.exceeded=Please limit the postal address to a maximum length of {3} characters +registration.name.maxSize.exceeded=Please limit the name to a maximum length of {3} characters +registration.postalAddress.maxSize.exceeded=Please limit the postal address to a maximum length of {3} characters registration.emailAddress.blank=Please enter an e-mail address -registration.emailAddress.maxLength.exceeded=Please limit the e-mail address to a maximum length of {3} characters +registration.emailAddress.maxSize.exceeded=Please limit the e-mail address to a maximum length of {3} characters registration.emailAddress.email.invalid=Please enter a valid e-mail address \ No newline at end of file racetrack_ch8/grails-app/i18n/messages.properties @@ -1,18 +1,22 @@ <g:if test="${!session.userId}"> <span class="menuButton"> - <g:link controller="user" action="login">Log in</g:link> + <g:link controller="user" action="login">Log +in</g:link> </span> </g:if> <g:else> <span class="menuButton"> <g:link controller="race" action="list"> - Manage Races & Registrations + Manage Races &amp; Registrations </g:link> </span> <span class="menuButton"> - <g:link controller="user" action="list">Manage Administrators</g:link> + <g:link controller="user" action="list">Manage Administrators + </g:link> </span> <span class="menuButton"> - <g:link controller="user" action="logout">Log out</g:link> + <g:link controller="user" action="logout"> + Log out + </g:link> </span> </g:else> racetrack_ch8/grails-app/views/_adminmenubar.gsp @@ -16,4 +16,4 @@ </tr> </table> </body> -</html> +</html> \ No newline at end of file racetrack_ch8/grails-app/views/layouts/public.gsp @@ -28,19 +28,19 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='startDateTime'>Start Date Time:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'startDateTime','errors')}'><g:datePicker name='startDateTime' value="${race?.startDateTime}"></g:datePicker></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='state'>State:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'state','errors')}'><g:select name='state' from='${race.constraints.state.inList.collect{it.encodeAsHTML()}}' value="${race.state?.encodeAsHTML()}"></g:select></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}" /></td></tr> </tbody> </table> racetrack_ch8/grails-app/views/race/create.gsp @@ -31,19 +31,19 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${race?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='startDateTime'>Start Date Time:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'startDateTime','errors')}'><g:datePicker name='startDateTime' value="${race?.startDateTime}"></g:datePicker></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='city'>City:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'city','errors')}'><input type="text" maxlength='30' name='city' value="${race?.city?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='state'>State:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'state','errors')}'><g:select name='state' from='${race.constraints.state.inList.collect{it.encodeAsHTML()}}' value="${race.state?.encodeAsHTML()}"></g:select></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='distance'>Distance (mi):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'distance','errors')}'><input type='text' name='distance' value="${race?.distance}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='cost'>Cost (US$):</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'cost','errors')}'><input type='text' name='cost' value="${race?.cost}" /></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='maxRunners'>Max Runners:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'maxRunners','errors')}'><input type='text' name='maxRunners' value="${race?.maxRunners}" /></td></tr> <tr class='prop'><td valign='top' class='name'><label for='registrations'>Registrations:</label></td><td valign='top' class='value ${hasErrors(bean:race,field:'registrations','errors')}'><ul> <g:each var='r' in='${race?.registrations?}'> racetrack_ch8/grails-app/views/race/edit.gsp @@ -10,7 +10,7 @@ <span class="menuButton"><a href="${createLinkTo(dir:'')}">Home</a></span> <span class="menuButton"><g:link action="create">New Race</g:link></span> <span class="menuButton"> - <g:link action="search">Search for Races</g:link> + <g:link action="search">Search for Races</g:link> </span> <g:render template="/adminmenubar" /> </div> @@ -24,17 +24,17 @@ <table> <thead> <tr> - <th>Name</th> - - <th>Start Date Time</th> - - <th>City</th> - - <th>State</th> - - <th>Distance</th> - - <th></th> + <g:sortableColumn property="name" title="Name" /> + + <g:sortableColumn property="startDateTime" title="Start Date Time" /> + + <g:sortableColumn property="city" title="City" /> + + <g:sortableColumn property="state" title="State" /> + + <g:sortableColumn property="distance" title="Distance" /> + + <th></th> </tr> </thead> <tbody> racetrack_ch8/grails-app/views/race/list.gsp @@ -1,14 +1,15 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <meta http-equiv="Content-Type" content="text/html; + charset=UTF-8"/> <meta name="layout" content="public" /> <title>Search for Races</title> </head> <body> - <div class="nav"> - <g:render template="/adminmenubar" /> - </div> - <div class="body"> + <div class="nav"> + <g:render template="/adminmenubar" /> + </div> + <div class="body"> <h1>Search for Races</h1> <g:if test="${flash.message}"> <div class="message">${flash.message}</div> @@ -30,34 +31,37 @@ <label for='state'>State:</label> </td> <td valign='top' class='value'> - <g:select name='state' from='${[""] + new Race().constraints.state.inList}'> + <g:select name='state' + from='${[""] + new Race().constraints.state.inList}'> </g:select> </td> </tr> - <tr class='prop'> - <td valign='top' class='name'> - <label for='date'>Date:</label> - </td> - <td valign='top' class='value'> - between - <g:datePicker name='minDate' precision='day' /> - and - <g:datePicker name='maxDate' precision='day' value='${new Date().plus(365*2)}'/> - </td> - </tr> - <tr class='prop'> - <td valign='top' class='name'> - <label for='distance'>Distance:</label> - </td> - <td valign='top' class='value'> - <select name='distanceOperator' > - <option value='AT_LEAST' >At least</option> - <option value='EXACTLY' >Exactly</option> - <option value='AT_MOST' >At most</option> - </select> - <input type='text' name='distance' size='5'></input> mi - </td> - </tr> + <tr class='prop'> + <td valign='top' class='name'> + <label for='date'>Date:</label> + </td> + <td valign='top' class='value'> + between + <g:datePicker name='minDate' precision='day' /> + and + <g:datePicker name='maxDate' precision='day' + value='${new Date().plus(365*2)}'/> + </td> + </tr> + <tr class='prop'> + <td valign='top' class='name'> + <label for='distance'>Distance:</label> + </td> + <td valign='top' class='value'> + <select name='distanceOperator' > + <option value='AT_LEAST' >At least</option> + <option value='EXACTLY' >Exactly</option> + <option value='AT_MOST' >At most</option> + </select> + <input type='text' name='distance' size='5'> + </input> mi + </td> + </tr> </table> </div> <div class="buttons"> racetrack_ch8/grails-app/views/race/search.gsp @@ -84,4 +84,4 @@ </div> </div> </body> -</html> \ No newline at end of file +</html> racetrack_ch8/grails-app/views/race/searchresults.gsp @@ -1,7 +1,7 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <g:javascript library="racetrack" /> <meta name="layout" content="main" /> <title>Show Race</title> racetrack_ch8/grails-app/views/race/show.gsp @@ -25,10 +25,7 @@ <div class="dialog"> <table> <tbody> - - - - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='dateOfBirth'>Date Of Birth:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'dateOfBirth','errors')}'><g:datePicker name='dateOfBirth' value="${registration?.dateOfBirth}" precision='day'></g:datePicker></td></tr> @@ -36,12 +33,10 @@ <tr class='prop'><td valign='top' class='name'><label for='postalAddress'>Postal Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'postalAddress','errors')}'><textarea rows='5' cols='40' name='postalAddress'>${registration?.postalAddress?.encodeAsHTML()}</textarea></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='race'>Race:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'race','errors')}'><g:select optionKey="id" from="${Race.list()}" name='race.id' value="${registration?.race?.id}"></g:select></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='createdAt'>Created At:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'createdAt','errors')}'><g:datePicker name='createdAt' value="${registration?.createdAt}"></g:datePicker></td></tr> - </tbody> </table> </div> racetrack_ch8/grails-app/views/registration/create.gsp @@ -31,7 +31,7 @@ - <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='name'>Name:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'name','errors')}'><input type="text" maxlength='50' name='name' value="${registration?.name?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='dateOfBirth'>Date Of Birth:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'dateOfBirth','errors')}'><g:datePicker name='dateOfBirth' value="${registration?.dateOfBirth}" precision='day'></g:datePicker></td></tr> @@ -39,7 +39,7 @@ <tr class='prop'><td valign='top' class='name'><label for='postalAddress'>Postal Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'postalAddress','errors')}'><textarea rows='5' cols='40' name='postalAddress'>${registration?.postalAddress?.encodeAsHTML()}</textarea></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='emailAddress'>Email Address:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'emailAddress','errors')}'><input type="text" maxlength='50' name='emailAddress' value="${registration?.emailAddress?.encodeAsHTML()}"/></td></tr> <tr class='prop'><td valign='top' class='name'><label for='race'>Race:</label></td><td valign='top' class='value ${hasErrors(bean:registration,field:'race','errors')}'><g:select optionKey="id" from="${Race.list()}" name='race.id' value="${registration?.race?.id}"></g:select></td></tr> @@ -51,7 +51,7 @@ <div class="buttons"> <span class="button"><g:actionSubmit value="Update" /></span> - <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRaceDelete();"/></span> + <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRegistrationDelete();" /></span> </div> </g:form> </div> racetrack_ch8/grails-app/views/registration/edit.gsp @@ -21,17 +21,17 @@ <table> <thead> <tr> - <th>Name</th> - - <th>Date Of Birth</th> - - <th>Gender</th> - - <th>Postal Address</th> - - <th>Email Address</th> - - <th></th> + <g:sortableColumn property="name" title="Name" /> + + <g:sortableColumn property="dateOfBirth" title="Date Of Birth" /> + + <g:sortableColumn property="gender" title="Gender" /> + + <g:sortableColumn property="postalAddress" title="Postal Address" /> + + <g:sortableColumn property="emailAddress" title="Email Address" /> + + <th></th> </tr> </thead> <tbody> racetrack_ch8/grails-app/views/registration/list.gsp @@ -5,10 +5,10 @@ <title>Register</title> </head> <body> + <div class="body"> <div class="nav"> <g:render template="/adminmenubar" /> </div> - <div class="body"> <h1>Register for ${race.name} </h1> <em>Start Date: <g:formatDate date="${race.startDateTime}" format="EEE, MMM d, yyyy"/> @@ -89,4 +89,4 @@ </g:form> </div> </body> -</html> \ No newline at end of file +</html> racetrack_ch8/grails-app/views/registration/register.gsp @@ -78,7 +78,7 @@ <g:form controller="registration"> <input type="hidden" name="id" value="${registration?.id}" /> <span class="button"><g:actionSubmit value="Edit" /></span> - <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRaceDelete();"/></span> + <span class="button"><g:actionSubmit value="Delete" onclick="return warnBeforeRegistrationDelete();" /></span> </g:form> </div> </div> racetrack_ch8/grails-app/views/registration/show.gsp @@ -9,6 +9,7 @@ <div class="nav"> <span class="menuButton"><a href="${createLinkTo(dir:'')}">Home</a></span> <span class="menuButton"><g:link action="list">User List</g:link></span> + <g:render template="/adminmenubar" /> </div> <div class="body"> <h1>Create User</h1> @@ -27,9 +28,9 @@ - <tr class='prop'><td valign='top' class='name'><label for='userId'>User Id:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'userId','errors')}'><input type="text" maxlength='8' name='userId' value="${user?.userId?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='userId'>User Id:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'userId','errors')}'><input type="text" maxlength='8' name='userId' value="${user?.userId?.encodeAsHTML()}"/></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='password'>Password:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'password','errors')}'><input type="text" maxlength='8' name='password' value="${user?.password?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='password'>Password:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'password','errors')}'><input type="text" maxlength='8' name='password' value="${user?.password?.encodeAsHTML()}"/></td></tr> </tbody> </table> racetrack_ch8/grails-app/views/user/create.gsp @@ -10,6 +10,7 @@ <span class="menuButton"><a href="${createLinkTo(dir:'')}">Home</a></span> <span class="menuButton"><g:link action="list">User List</g:link></span> <span class="menuButton"><g:link action="create">New User</g:link></span> + <g:render template="/adminmenubar" /> </div> <div class="body"> <h1>Edit User</h1> @@ -33,9 +34,9 @@ - <tr class='prop'><td valign='top' class='name'><label for='userId'>User Id:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'userId','errors')}'><input type="text" maxlength='8' name='userId' value="${user?.userId?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='userId'>User Id:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'userId','errors')}'><input type="text" maxlength='8' name='userId' value="${user?.userId?.encodeAsHTML()}"/></td></tr> - <tr class='prop'><td valign='top' class='name'><label for='password'>Password:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'password','errors')}'><input type="text" maxlength='8' name='password' value="${user?.password?.encodeAsHTML()}"></input></td></tr> + <tr class='prop'><td valign='top' class='name'><label for='password'>Password:</label></td><td valign='top' class='value ${hasErrors(bean:user,field:'password','errors')}'><input type="text" maxlength='8' name='password' value="${user?.password?.encodeAsHTML()}"/></td></tr> </tbody> </table> racetrack_ch8/grails-app/views/user/edit.gsp @@ -9,6 +9,7 @@ <div class="nav"> <span class="menuButton"><a href="${createLinkTo(dir:'')}">Home</a></span> <span class="menuButton"><g:link action="create">New User</g:link></span> + <g:render template="/adminmenubar" /> </div> <div class="body"> <h1>User List</h1> @@ -20,15 +21,14 @@ <table> <thead> <tr> - - - <th>Id</th> - - <th>User Id</th> - - <th>Password</th> - - <th></th> + + <g:sortableColumn property="id" title="Id" /> + + <g:sortableColumn property="userId" title="User Id" /> + + <g:sortableColumn property="password" title="Password" /> + + <th></th> </tr> </thead> <tbody> racetrack_ch8/grails-app/views/user/list.gsp @@ -44,4 +44,4 @@ </g:form> </div> </body> -</html> +</html> \ No newline at end of file racetrack_ch8/grails-app/views/user/login.gsp @@ -10,6 +10,7 @@ <span class="menuButton"><a href="${createLinkTo(dir:'')}">Home</a></span> <span class="menuButton"><g:link action="list">User List</g:link></span> <span class="menuButton"><g:link action="create">New User</g:link></span> + <g:render template="/adminmenubar" /> </div> <div class="body"> <h1>Show User</h1> racetrack_ch8/grails-app/views/user/show.gsp @@ -18,7 +18,7 @@ class RaceTests extends GroovyTestCase { def race = getValidRace() race.name = 'It may very well take longer to type out the name of ' + 'this race than to just go run it.' - assertValidationError(race, 'name', 'race.name.maxLength.exceeded') + assertValidationError(race, 'name', 'race.name.maxSize.exceeded') } void testNameNullConstraint() { @@ -48,7 +48,7 @@ class RaceTests extends GroovyTestCase { void testCityMaxConstraint() { def race = getValidRace() race.city = 'I pity the fool that lives in a city with a name this long.' - assertValidationError(race, 'city', 'race.city.maxLength.exceeded') + assertValidationError(race, 'city', 'race.city.maxSize.exceeded') } void testStateNullConstraint() { @@ -84,7 +84,7 @@ class RaceTests extends GroovyTestCase { void testDistanceMaxConstraint() { def race = getValidRace() race.distance = 100.0001 - assertValidationError(race, 'distance', 'race.distance.max.exceeded') // TODO Explain where to find the list of error codes - the validation reference page + assertValidationError(race, 'distance', 'race.distance.max.exceeded') } void testCostNullConstraint() { racetrack_ch8/grails-tests/RaceTests.groovy @@ -25,7 +25,10 @@ import org.springframework.context.NoSuchMessageException; import org.springframework.web.servlet.support.RequestContextUtils as RCU; import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU; -class ApplicationTagLib { +class ApplicationTagLib { + + def grailsUrlMappingsHolder + /** * Creates a link to a resource, generally used as a method rather than a tag. * @@ -33,7 +36,7 @@ class ApplicationTagLib { */ def createLinkTo = { attrs -> out << grailsAttributes.getApplicationUri(request) - if(attrs['dir']) { + if(attrs['dir'] || attrs['dir'] == '') { out << "/${attrs['dir']}" } if(attrs['file']) { @@ -50,7 +53,7 @@ class ApplicationTagLib { def link = { attrs, body -> out << "<a href=\"" // create the link - createLink(attrs) + out << createLink(attrs) out << '\" ' // process remaining attributes @@ -59,7 +62,7 @@ class ApplicationTagLib { } out << ">" // output the body - body() + out << body() // close tag out << "</a>" @@ -79,29 +82,47 @@ class ApplicationTagLib { if(attrs['url']) { attrs = attrs.remove('url') } - // if the current attribute null set the controller uri to the current controller - if(attrs["controller"]) { - out << '/' << attrs.remove("controller") - } - else { - out << grailsAttributes.getControllerUri(request) - } - if(attrs["action"]) { - out << '/' << attrs.remove("action") - } - if(attrs["id"]) { - out << '/' << attrs.remove("id") - } - if(attrs['params']) { - def pms = attrs.remove('params') - out << '?' - def i = 0 - pms.each { k,v -> - out << "${k.encodeAsURL()}=${v?.encodeAsURL()}" - if(++i < pms.size()) - out << '&' - } - } + + def controller = attrs.containsKey("controller") ? attrs.remove("controller") : grailsAttributes.getController(request).controllerName + def action = attrs.remove("action") + def id = attrs.remove("id") + def params = attrs.params ? attrs.remove('params') : [:] + + def url + try { + if(id) params.id = id + def mapping = grailsUrlMappingsHolder?.getReverseMapping(controller,action,params) + params.controller = controller + if(action) params.action = action + url = mapping?.createURL(params) + } + finally { + params.remove('controller') + params.remove('action') + params.remove('id') + } + if(url) { + out << url + } + else { + out << '/' << controller + if(action) { + out << '/' << action + } + if(id) { + out << '/' << id + } + if(params) { + out << '?' + def i = 0 + params.each { k,v -> + out << "${k.encodeAsURL()}=${v?.encodeAsURL()}" + if(++i < params.size()) + out << '&' + } + } + } + } /** @@ -127,8 +148,8 @@ class ApplicationTagLib { } } } - out << '>' - body() + out << '>' + out << body() out << "</${attrs.name}>" } } racetrack_ch8/plugins/core/grails-app/taglib/ApplicationTagLib.groovy @@ -16,6 +16,7 @@ import org.springframework.validation.Errors; import org.springframework.context.NoSuchMessageException; import org.springframework.web.servlet.support.RequestContextUtils as RCU; import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU; +import org.codehaus.groovy.grails.commons.DomainClassArtefactHandler; /** * A tag lib that provides tags for working with form controls @@ -33,7 +34,10 @@ class FormTagLib { def textField = { attrs -> attrs.type = "text" attrs.tagName = "textField" - field(attrs) + def result = field(attrs) + if(result) { + out << result + } } /** * Creates a hidden field @@ -41,7 +45,7 @@ class FormTagLib { def hiddenField = { attrs -> attrs.type = "hidden" attrs.tagName = "hiddenField" - field(attrs) + out << field(attrs) } /** * Creates a submit button @@ -49,7 +53,7 @@ class FormTagLib { def submitButton = { attrs -> attrs.type = "submit" attrs.tagName = "submitButton" - field(attrs) + out << field(attrs) } /** * A general tag for creating fields @@ -84,7 +88,7 @@ class FormTagLib { void resolveAttributes(attrs) { if(!attrs.name && !attrs.field) { - throwTagError("Tag [$tagName] is missing required attribute [name] or [field]") + throwTagError("Tag [${attrs.tagName}] is missing required attribute [name] or [field]") } attrs.remove('tagName') @@ -121,7 +125,7 @@ class FormTagLib { def form = { attrs, body -> out << "<form action=\"" // create the link - createLink(attrs) + out << createLink(attrs) out << '\" ' // default to post @@ -133,26 +137,34 @@ class FormTagLib { out << ">" // output the body - body() + def bodyContent = body() + out << bodyContent // close tag out << "</form>" } /** * Creates a submit button that submits to an action in the controller specified by the form action - * The value of the action attribute is translated into the action name, for example "Edit" becomes - * "edit" or "List People" becomes "listPeople" + * The name of the action attribute is translated into the action name, for example "Edit" becomes + * "_action_edit" or "List People" becomes "_action_listPeople" + * If the action attribute is not specified, the value attribute will be used as part of the action name * * <g:actionSubmit value="Edit" /> + * <g:actionSubmit action="Edit" value="Some label for editing" /> * */ def actionSubmit = { attrs -> - out << '<input type="submit" name="_action" ' - def value = attrs.remove('value') - if(value) { - out << "value=\"${value}\" " + if(!attrs.value) { + throwTagError("Tag [$tagName] is missing required attribute [value]") } - // process remaining attributes + + // add action and value + def value = attrs.remove('value') + def action = attrs.action ? attrs.remove('action') : value + + out << "<input type=\"submit\" name=\"_action_${action}\" value=\"${value}\" " + + // process remaining attributes outputAttributes(attrs) // close tag @@ -161,22 +173,30 @@ class FormTagLib { } /** * Creates a an image submit button that submits to an action in the controller specified by the form action - * The value of the action attribute is translated into the action name, for example "Edit" becomes - * "edit" or "List People" becomes "listPeople" + * The name of the action attribute is translated into the action name, for example "Edit" becomes + * "_action_edit" or "List People" becomes "_action_listPeople" + * If the action attribute is not specified, the value attribute will be used as part of the action name * * <g:actionSubmitImage src="/images/submitButton.gif" action="Edit" /> * */ def actionSubmitImage = { attrs -> - out << '<input type="image" name="_action" ' - def value = attrs.remove('value') - if(value) { - out << "value=\"${value}\" " + if(!attrs.value) { + throwTagError("Tag [$tagName] is missing required attribute [value]") } + + // add action and value + def value = attrs.remove('value') + def action = attrs.action ? attrs.remove('action') : value + + out << "<input type=\"image\" name=\"_action_${action}\" value=\"${value}\" " + + // add image src def src = attrs.remove('src') if(src) { out << "src=\"${src}\" " } + // process remaining attributes outputAttributes(attrs) @@ -201,6 +221,8 @@ class FormTagLib { def value = (attrs['value'] ? attrs['value'] : xdefault) def name = attrs['name'] + def id = attrs['id'] ? attrs['id'] : name + def noSelection = attrs['noSelection'] if (noSelection != null) { @@ -253,7 +275,7 @@ class FormTagLib { // create day select if (precision >= PRECISION_RANKINGS["day"]) { - out.println "<select name=\"${name}_day\">" + out.println "<select name=\"${name}_day\" id=\"${id}_day\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -272,7 +294,7 @@ class FormTagLib { // create month select if (precision >= PRECISION_RANKINGS["month"]) { - out.println "<select name=\"${name}_month\">" + out.println "<select name=\"${name}_month\" id=\"${id}_month\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -294,7 +316,7 @@ class FormTagLib { // create year select if (precision >= PRECISION_RANKINGS["year"]) { - out.println "<select name=\"${name}_year\">" + out.println "<select name=\"${name}_year\" id=\"${id}_year\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -313,7 +335,7 @@ class FormTagLib { // do hour select if (precision >= PRECISION_RANKINGS["hour"]) { - out.println "<select name=\"${name}_hour\">" + out.println "<select name=\"${name}_hour\" id=\"${id}_hour\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -338,7 +360,7 @@ class FormTagLib { // do minute select if (precision >= PRECISION_RANKINGS["minute"]) { - out.println "<select name=\"${name}_minute\">" + out.println "<select name=\"${name}_minute\" id=\"${id}_minute\">" if (noSelection) { renderNoSelectionOption( noSelection.key, noSelection.value, '') @@ -360,7 +382,7 @@ class FormTagLib { def renderNoSelectionOption = { noSelectionKey, noSelectionValue, value -> // If a label for the '--Please choose--' first item is supplied, write it out out << '<option value="' << (noSelectionKey == null ? "" : noSelectionKey) << '"' - if(noSelectionKey == value) { + if(noSelectionKey.equals(value)) { out << ' selected="selected" ' } out << '>' << noSelectionValue.encodeAsHTML() << '</option>' @@ -388,7 +410,7 @@ class FormTagLib { } // use generic select - select( attrs ) + out << select( attrs ) } /** @@ -405,7 +427,7 @@ class FormTagLib { attrs['optionValue'] = { "${it.language}, ${it.country}, ${it.displayName}" } // use generic select - select( attrs ) + out << select( attrs ) } /** @@ -425,7 +447,7 @@ class FormTagLib { attrs.value = null } // invoke generic select - select( attrs ) + out << select( attrs ) } /** @@ -436,11 +458,15 @@ class FormTagLib { * <g:select name="user.company.id" from="${Company.list()}" value="${user?.company.id}" optionKey="id" /> */ def select = { attrs -> + def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource") + def locale = RCU.getLocale(request) + def from = attrs.remove('from') def keys = attrs.remove('keys') def optionKey = attrs.remove('optionKey') def optionValue = attrs.remove('optionValue') def value = attrs.remove('value') + def valueMessagePrefix = attrs.remove('valueMessagePrefix') def noSelection = attrs.remove('noSelection') if (noSelection != null) { noSelection = noSelection.entrySet().iterator().next() @@ -461,20 +487,21 @@ class FormTagLib { // create options from list if(from) { from.eachWithIndex { el,i -> + def keyValue = null out << '<option ' if(keys) { - out << 'value="' << keys[i] << '" ' - if(keys[i] == value) { + keyValue = keys[i] + out << 'value="' << keyValue << '" ' + if(keyValue == value) { out << 'selected="selected" ' } } - else if(optionKey) { - def keyValue = null + else if(optionKey) { if(optionKey instanceof Closure) { keyValue = optionKey(el) - out << 'value="' << keyValue << '" ' + out << 'value="' << keyValue << '" ' } - else if(el !=null && optionKey == 'id' && grailsApplication.getGrailsDomainClass(el.getClass().name)) { + else if(el !=null && optionKey == 'id' && grailsApplication.getArtefact(DomainClassArtefactHandler.TYPE, el.getClass().name)) { keyValue = el.ident() out << 'value="' << keyValue << '" ' } @@ -488,8 +515,9 @@ class FormTagLib { } } else { - out << "value=\"${el}\" " - if(el == value) { + keyValue = el + out << "value=\"${keyValue}\" " + if(keyValue == value) { out << 'selected="selected" ' } } @@ -502,6 +530,19 @@ class FormTagLib { out << el.properties[optionValue].toString().encodeAsHTML() } } + else if(valueMessagePrefix) { + def message = messageSource.getMessage("${valueMessagePrefix}.${keyValue}", null, null, locale) + if(message) { + out << message.encodeAsHTML() + } + else if (keyValue) { + out << keyValue.encodeAsHTML() + } + else { + def s = el.toString() + if(s) out << s.encodeAsHTML() + } + } else { def s = el.toString() if(s) out << s.encodeAsHTML() @@ -554,6 +595,6 @@ class FormTagLib { outputAttributes(attrs) // close the tag, with no body - out << ' ></input>' + out << ' />' } } \ No newline at end of file racetrack_ch8/plugins/core/grails-app/taglib/FormTagLib.groovy @@ -95,7 +95,7 @@ class JavascriptTagLib { } else { out.println '<script type="text/javascript">' - body() + out << body() out.println '</script>' } } @@ -137,15 +137,15 @@ class JavascriptTagLib { /** * A link to a remote uri that used the prototype library to invoke the link via ajax */ - def remoteLink = { attrs, body -> + def remoteLink = { attrs, body -> out << "<a href=\"" def cloned = deepClone(attrs) - createLink(cloned) + out << createLink(cloned) out << "\" onclick=\"" // create remote function - remoteFunction(attrs) + out << remoteFunction(attrs) attrs.remove('url') out << "return false;\" " // process remaining attributes @@ -154,7 +154,7 @@ class JavascriptTagLib { } out << ">" // output the body - body() + out << body() // close tag out << "</a>" @@ -180,7 +180,7 @@ class JavascriptTagLib { else { attrs.params = "'${paramName}='+this.value" } - remoteFunction(attrs) + out << remoteFunction(attrs) attrs.remove('params') out << "\"" attrs.remove('url') @@ -208,16 +208,16 @@ class JavascriptTagLib { // prepare form settings prepareAjaxForm(p,attrs) - def params = [ onsubmit:TagLibUtil.outToString(remoteFunction,attrs) + 'return false', + def params = [ onsubmit:remoteFunction(attrs) + 'return false', method: (attrs.method? attrs.method : 'POST' ), - action: (attrs.action? attrs.action : TagLibUtil.outToString(createLink,url)) + action: (attrs.action? attrs.action : createLink(url)) ] attrs.remove('url') params.putAll(attrs) if(params.name && !params.id) params.id = params.name - withTag(name:'form',attrs:params) { - body() + out << withTag(name:'form',attrs:params) { + out << body() } } @@ -230,7 +230,7 @@ class JavascriptTagLib { // prepare form settings attrs.forSubmitTag = ".form" prepareAjaxForm(p,attrs) - def params = [ onclick:TagLibUtil.outToString(remoteFunction,attrs) + 'return false', + def params = [ onclick:remoteFunction(attrs) + 'return false', type: 'button', name: attrs.remove('name'), value: attrs.remove('value'), @@ -238,8 +238,8 @@ class JavascriptTagLib { 'class':attrs.remove('class') ] - withTag(name:'input', attrs:params) { - body() + out << withTag(name:'input', attrs:params) { + out << body() } } @@ -275,7 +275,7 @@ class JavascriptTagLib { def sw = new StringWriter() out = new PrintWriter(out) // invoke body - body() + out << body() // restore out out = tmp js = sw.toString() @@ -357,10 +357,10 @@ class PrototypeProvider implements JavascriptProvider { def pms = attrs.remove('params') if(attrs.url) { - taglib.createLink(attrs.url) + out << taglib.createLink(attrs.url) } else { - taglib.createLink(attrs) + out << taglib.createLink(attrs) } @@ -415,6 +415,7 @@ class PrototypeProvider implements JavascriptProvider { case 'true': ajaxOptions << "${k}:${v}"; break; case 'false': ajaxOptions << "${k}:${v}"; break; case ~/\s*function(\w*)\s*/: ajaxOptions << "${k}:${v}"; break; + case ~/Insertion\..*/: ajaxOptions << "${k}:${v}"; break; default:ajaxOptions << "${k}:'${v}'"; break; } } @@ -441,10 +442,10 @@ class YahooProvider implements JavascriptProvider { out << "YAHOO.util.Connect.asyncRequest('${method}','" if(attrs.url) { - taglib.createLink(attrs.url) + out << taglib.createLink(attrs.url) } else { - taglib.createLink(attrs) + out << taglib.createLink(attrs) } attrs.remove('url') out << "'," @@ -504,7 +505,7 @@ class DojoProvider implements JavascriptProvider { } out << 'dojo.io.bind({url:\'' - taglib.createLink(attrs) + out << taglib.createLink(attrs) attrs.remove('params') out << '\',load:function(type,data,evt) {' if(attrs.onLoaded) { racetrack_ch8/plugins/core/grails-app/taglib/JavascriptTagLib.groovy @@ -25,6 +25,7 @@ import org.springframework.web.servlet.support.RequestContextUtils as RCU; import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU; class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants { + def out // to facilitate testing protected getPage() { return request[PAGE] @@ -91,7 +92,7 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants } } if(invokeBody) { - body(); + out << body() } } } @@ -134,54 +135,183 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants if(attrs.total == null) throwTagError("Tag [paginate] is missing required attribute [total]") - def mkp = new groovy.xml.MarkupBuilder(out) + def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource") + def locale = RCU.getLocale(request) + def total = attrs.total.toInteger() - def max = params.max?.toInteger() - def offset = params.offset?.toInteger() def action = (attrs.action? attrs.action : 'list') - def breadcrumb = true - if(attrs.breadcrumb) breadcrumb = Boolean.valueOf(attrs.breadcrumb) - + def offset = params.offset?.toInteger() + def max = params.max?.toInteger() + def maxsteps = (attrs.maxsteps ? attrs.maxsteps.toInteger() : 10) + + if(attrs.breadcrumb) { + log.warn("Tag [paginate] includes the [breadcrumb] attribute. This attribute is deprecated and will be removed in the future. Please update your code to use the [maxsteps] attribute instead.") + } + + if(!offset) offset = (attrs.offset ? attrs.offset.toInteger() : 0) if(!max) max = (attrs.max ? attrs.max.toInteger() : 10) - if(!offset) offset = (attrs.offset ? attrs.offset.toInteger() : 0) - def linkParams = [offset:offset-max,max:max] - def linkTagAttrs = ['class':'prevLink',action:action] + def linkParams = [offset:offset - max, max:max] + if(params.sort) linkParams.sort = params.sort + if(params.order) linkParams.order = params.order + if(attrs.params) linkParams.putAll(attrs.params) + + def linkTagAttrs = [action:action] if(attrs.controller) { linkTagAttrs.controller = attrs.controller } if(attrs.id) { linkTagAttrs.id = attrs.id } - if(attrs.params)linkParams.putAll(attrs.params) linkTagAttrs.params = linkParams - - def combined = max + offset - if(offset > 0) { - link(linkTagAttrs.clone(),{out<< (attrs.prev? attrs.prev : 'Previous' ) }) + + // determine paging variables + def steps = maxsteps > 0 + int currentstep = (offset / max) + 1 + int firststep = 1 + int laststep = Math.round(Math.ceil(total / max)) + + // display previous link when not on firststep + if(currentstep > firststep) { + linkTagAttrs.class = 'prevLink' + out << link(linkTagAttrs.clone()) { + (attrs.prev ? attrs.prev : messageSource.getMessage('default.paginate.prev', null, 'Previous', locale)) + } } - if(total > max) { - linkTagAttrs.'class' = 'step' - if(breadcrumb) { - def j = 0 - 0.step(total,max) { i -> - if(offset == i) { - mkp.a('class':'step',"${++j}") - } - else { - linkParams.offset=i - link(linkTagAttrs.clone(),{out<<++j}) - } - } + // display steps when steps are enabled and laststep is not firststep + if(steps && laststep > firststep) { + linkTagAttrs.class = 'step' + + // determine begin and endstep paging variables + int beginstep = currentstep - Math.round(maxsteps / 2) + (maxsteps % 2) + int endstep = currentstep + Math.round(maxsteps / 2) - 1 + + if(beginstep < firststep) { + beginstep = firststep + endstep = maxsteps + } + if(endstep > laststep) { + beginstep = laststep - maxsteps + 1 + if(beginstep < firststep) { + beginstep = firststep + } + endstep = laststep + } + + // display firststep link when beginstep is not firststep + if(beginstep > firststep) { + linkParams.offset = 0 + out << link(linkTagAttrs.clone()) {firststep.toString()} + out << '<span class="step">..</span>' + } + + // display paginate steps + (beginstep..endstep).each { i -> + if(currentstep == i) { + out << "<span class=\"currentStep\">${i}</span>" + } + else { + linkParams.offset = (i - 1) * max + out << link(linkTagAttrs.clone()) {i.toString()} + } + } + + // display laststep link when endstep is not laststep + if(endstep < laststep) { + out << '<span class="step">..</span>' + linkParams.offset = (laststep -1) * max + out << link(linkTagAttrs.clone()) { laststep.toString() } + } + } + + // display next link when not on laststep + if(currentstep < laststep) { + linkTagAttrs.class = 'nextLink' + linkParams.offset = offset + max + out << link(linkTagAttrs.clone()) { + (attrs.next ? attrs.next : messageSource.getMessage('default.paginate.next', null, 'Next', locale)) } } - linkParams.offset = offset+max - if(combined < total) { - linkTagAttrs.'class'='nextLink' - link(linkTagAttrs,{out<< (attrs.'next'? attrs.'next' : 'Next' )}) + + } + + /** + * Renders a sortable column to support sorting in list views + * + * Attributes: + * + * property - name of the property relating to the field + * defaultOrder (optional) - default order for the property; choose between asc (default if not provided) and desc + * title (optional*) - title caption for the column + * titleKey (optional*) - title key to use for the column, resolved against the message source + * params (optional) - a map containing request parameters + * + * Attribute title or titleKey is required. When both attributes are specified then titleKey takes precedence, + * resulting in the title caption to be resolved against the message source. In case when the message could + * not be resolved, the title will be used as title caption. + * + * Examples: + * + * <g:sortableColumn property="title" title="Title" /> + * <g:sortableColumn property="title" title="Title" style="width: 200px" /> + * <g:sortableColumn property="title" titleKey="book.title" /> + * <g:sortableColumn property="releaseDate" defaultOrder="desc" title="Release Date" /> + * <g:sortableColumn property="releaseDate" defaultOrder="desc" title="Release Date" titleKey="book.releaseDate" /> + */ + def sortableColumn = { attrs -> + + if(!attrs.property) + throwTagError("Tag [sortableColumn] is missing required attribute [property]") + + if(!attrs.title && !attrs.titleKey) + throwTagError("Tag [sortableColumn] is missing required attribute [title] or [titleKey]") + + def property = attrs.remove("property") + def action = attrs.action ? attrs.remove("action") : "list" + + def defaultOrder = attrs.remove("defaultOrder") + if(defaultOrder != "desc") defaultOrder = "asc" + + // current sorting property and order + def sort = params.sort + def order = params.order + + // add sorting property and params to link params + def linkParams = [sort:property] + if(attrs.params) linkParams.putAll(attrs.params) + + // determine and add sorting order for this column to link params + attrs.class = "sortable" + if(property == sort) { + attrs.class = attrs.class + " sorted " + order + if(order == "asc") { + linkParams.order = "desc" + } + else { + linkParams.order = "asc" + } + } + else { + linkParams.order = defaultOrder + } + + // determine column title + def title = attrs.remove("title") + def titleKey = attrs.remove("titleKey") + if(titleKey) { + if(!title) title = titleKey + def messageSource = grailsAttributes.getApplicationContext().getBean("messageSource") + def locale = RCU.getLocale(request) + title = messageSource.getMessage(titleKey, null, title, locale) } + out << "<th " + // process remaining attributes + attrs.each { k, v -> + out << "${k}=\"${v.encodeAsHTML()}\" " + } + out << ">${link(action:action, params:linkParams) { title }}</th>" } /** @@ -199,14 +329,7 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants def uri = grailsAttributes.getTemplateUri(attrs.template,request) def var = attrs['var'] - def url = servletContext.getResource(uri) - if(!url) - throwTagError("No template found for name [${attrs.template}] in tag [render]") - - def t = engine.createTemplate( uri, - servletContext, - request, - response) + def t = engine.createTemplate( uri ) if(attrs.model instanceof Map) { t.make( attrs.model ).writeTo(out) @@ -246,14 +369,7 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants def engine = grailsAttributes.getPagesTemplateEngine() def uri = grailsAttributes.getTemplateUri(attrs.template,request) - def url = servletContext.getResource(uri) - if(!url) - throwTagError("No template found for name [${attrs.template}] in tag [include]") - - def t = engine.createTemplate( uri, - servletContext, - request, - response) + def t = engine.createTemplate( uri ) t.make().writeTo(out) } racetrack_ch8/plugins/core/grails-app/taglib/RenderTagLib.groovy @@ -152,7 +152,7 @@ class UITagLib { * <g:richTextEditor name="editor" height="400" /> */ def richTextEditor = { attrs -> - withTag(name:'script',attributes:[type:'text/javascript']) { + out << withTag(name:'script',attributes:[type:'text/javascript']) { if(attrs.onComplete) { out.println "function FCKeditor_OnComplete( editorInstance ) {" out.println "${attrs.onComplete}(editorInstance);" @@ -162,24 +162,53 @@ class UITagLib { var oFCKeditor = new FCKeditor( '${attrs.name}' ) ; oFCKeditor.BasePath = \"""" if(attrs.basepath) { - createLinkTo(dir:attrs.basepath) + out << createLinkTo(dir:attrs.basepath) } else { - createLinkTo(dir:"fckeditor/") + out << createLinkTo(dir:"fckeditor/") } out.println '";' if(attrs.toolbar) { out << "oFCKeditor.ToolbarSet = '${attrs.toolbar}';" - } + } + // add width support + if(attrs.width) + out.println "oFCKeditor.Width = '${attrs.width}';" + if(attrs.height) - out.println "oFCKeditor.Height = ${attrs.height};" + out.println "oFCKeditor.Height = '${attrs.height}';" + + // add skin support, values to choose: "default", "office2003", "silver" + if(attrs.skin) + out.println "oFCKeditor.Config['SkinPath'] = 'skins/${attrs.skin}/';" + + // check the browser compatibility when rendering the editor. default value: true, values to choose: true, false, + if(attrs.checkBrowser) + out.println "oFCKeditor.CheckBrowser = ${attrs.checkBrowser};" + + // show error messages on errors while rendering the editor. default value: true, values to choose: true, false + if(attrs.displayErrors) + out.println "oFCKeditor.DisplayErrors = ${attrs.displayErrors};" + + // oFCKeditor.Config AutoDetectLanguage:true/false, DefaultLanguage:'pt-BR' and so on + if(attrs.config) { + if (attrs.config instanceof Map) { + attrs.config.each { k, v -> + out.println "oFCKeditor.Config['$k'] = '$v';" + } + } else { + throw new Exception("""The format of config is not correct, it should be like "[AutoDetectLanguage:false, DefaultLanguage:'pt-BR']" """) + } + } + if(attrs.value) { out << "oFCKeditor.Value = \"" - escapeJavascript(Collections.EMPTY_MAP,attrs.value) + out << escapeJavascript(Collections.EMPTY_MAP,attrs.value) out.println "\" ;" } - out.println "oFCKeditor.Create();" + out.println "oFCKeditor.Create();" + } } } \ No newline at end of file racetrack_ch8/plugins/core/grails-app/taglib/UITagLib.groovy @@ -32,9 +32,7 @@ class ValidationTagLib { def model = attrs['model'] def checkList = [] if(model) { - checkList = model.findAll { k,v -> - return ((v.errors != null) && (v.errors instanceof Errors)) - } + checkList = model.findAll { it.value?.errors instanceof Errors }.collect { it.value } } if(attrs['bean']) { checkList << attrs['bean'] @@ -45,7 +43,7 @@ class ValidationTagLib { if(ra) { if(ra instanceof Errors) checkList << ra - else if ((ra.properties.errors) && (ra.errors instanceof Errors)) { + else if (ra.properties?.errors instanceof Errors) { checkList << ra } } @@ -55,23 +53,29 @@ class ValidationTagLib { for(i in checkList) { def errors = null - if(i instanceof Errors) { + if (i instanceof Errors) { errors = i } - else { - if ((i.errors != null) && (i.errors instanceof Errors)) { - if (i.hasErrors()) - errors = i.errors - } + else { + try { + if ((i.errors != null) && (i.errors instanceof Errors)) { + if (i.hasErrors()) + errors = i.errors + } + + } + catch(MissingPropertyException mpe) { + // ignore + } } if(errors) { if(attrs['field']) { if(errors.hasFieldErrors(attrs['field'])) { - body() + out << body() } } else { - body() + out << body() } } } @@ -84,9 +88,7 @@ class ValidationTagLib { def model = attrs['model'] def errorList = [] if(model) { - errorList = model.findAll { k,v -> - return ((v.errors != null) && (v.errors instanceof Errors)) - } + errorList = model.findAll { it.value?.errors instanceof Errors }.collect { it.value } } if(attrs['bean']) { errorList << attrs['bean'] @@ -95,9 +97,9 @@ class ValidationTagLib { request.attributeNames.each { def ra = request[it] if(ra) { - if(ra instanceof Errors) + if (ra instanceof Errors) errorList << ra - else if ((ra.errors != null) && (ra.errors instanceof Errors)) { + else if (ra.properties?.errors instanceof Errors) { errorList << ra } } @@ -119,13 +121,13 @@ class ValidationTagLib { if(attrs['field']) { if(errors.hasFieldErrors(attrs['field'])) { errors.getFieldErrors( attrs["field"] ).each { - body(it) + out << body(it) } } } else { errors.allErrors.each { - body( it ) + out << body( it ) } } } @@ -141,9 +143,9 @@ class ValidationTagLib { if(renderAs == 'list') { out << "<ul>" - eachError(attrs, { + out << eachError(attrs, { out << "<li>" - message(error:it) + out << message(error:it) out << "</li>" } ) @@ -219,7 +221,7 @@ class ValidationTagLib { } def app = grailsAttributes.getGrailsApplication() - def dc = app.getGrailsDomainClass(againstClass) + def dc = app.getDomainClass(againstClass) if(!dc) throwTagError("Tag [validate] could not find a domain class to validate against for name [${againstClass}]") racetrack_ch8/plugins/core/grails-app/taglib/ValidationTagLib.groovy @@ -8,7 +8,7 @@ class URLCodec { } static decode = { obj -> - URLEncoder.decode(obj.toString(), URLCodec.getEncoding()) + URLDecoder.decode(obj.toString(), URLCodec.getEncoding()) } private static def getEncoding() { racetrack_ch8/plugins/core/grails-app/utils/URLCodec.groovy @@ -1,13 +1,7 @@ -CREATE USER SA PASSWORD "" ADMIN -/*C1*/SET SCHEMA PUBLIC +/*C4*/SET SCHEMA PUBLIC CONNECT USER SA DISCONNECT -/*C2*/SET SCHEMA PUBLIC +/*C5*/SET SCHEMA PUBLIC CONNECT USER SA -/*C3*/SET SCHEMA PUBLIC +/*C6*/SET SCHEMA PUBLIC CONNECT USER SA -/*C2*/create table race (id bigint generated by default as identity (start with 1), version bigint not null, distance float not null, max_runners integer not null, start_date_time timestamp not null, state varchar(255) not null, cost float not null, name varchar(50) not null, city varchar(30) not null, primary key (id)) -create table registration (id bigint generated by default as identity (start with 1), version bigint not null, gender varchar(255) not null, date_of_birth timestamp not null, postal_address varchar(255), email_address varchar(50) not null, created_at timestamp not null, race_id bigint, name varchar(50) not null, primary key (id)) -create table user (id bigint generated by default as identity (start with 1), version bigint not null, password varchar(8) not null, user_id varchar(8) not null, primary key (id)) -alter table registration add constraint FKAF83E8B939D5A83A foreign key (race_id) references race -INSERT INTO USER VALUES(1,0,'password','adminjoe') racetrack_ch8/prodDb.log @@ -1,5 +1,5 @@ #HSQL Database Engine -#Sun Mar 11 21:27:40 EDT 2007 +#Sat May 19 16:47:00 EDT 2007 hsqldb.script_format=0 runtime.gc_interval=0 sql.enforce_strict_size=false racetrack_ch8/prodDb.properties @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> - -<beans> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> </beans> \ No newline at end of file racetrack_ch8/spring/resources.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> -<beans> <bean id="grailsApplication" class="org.codehaus.groovy.grails.commons.GrailsApplicationFactoryBean"> <description>Grails application factory bean</description> <property name="groovyFiles"> @@ -25,7 +27,7 @@ <property name="pluginManager" ref="pluginManager" /> </bean> - <bean id="grailsResourceHolder" singleton="false" class="org.codehaus.groovy.grails.commons.spring.GrailsResourceHolder"> + <bean id="grailsResourceHolder" scope="prototype" class="org.codehaus.groovy.grails.commons.spring.GrailsResourceHolder"> <property name="resources"> <value>classpath*:**/grails-app/**/*.groovy</value> </property> racetrack_ch8/web-app/WEB-INF/applicationContext.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> - -<beans> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> </beans> \ No newline at end of file racetrack_ch8/web-app/WEB-INF/spring/resources.xml @@ -10,6 +10,254 @@ <uri>http://grails.codehaus.org/tags</uri> <tag> + <description> + Enables the storing of a value into the given ${var} + </description> + <name>set</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovySetTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The value to store</description> + <name>value</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The name of the variable to store the value in</description> + <name>var</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Enables the storing of a value into the given ${var} into the page context + </description> + <name>def</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyDefTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The value to store</description> + <name>value</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The name of the variable to store the value in</description> + <name>var</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Logical if tag to test whether the given condition is true + </description> + <name>if</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyIfTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The condition to test</description> + <name>test</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Logical else tag as fallback if the if condition fails + </description> + <name>else</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyElseTag</tag-class> + <body-content>JSP</body-content> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Logical elseif tag to test whether the given condition is true + </description> + <name>elseif</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyElseIfTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The condition to test</description> + <name>test</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description> + Tag to loop over a collection while the test expression returns true + </description> + <name>while</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyWhileTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The condition to test</description> + <name>test</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection</description> + <name>each</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyEachTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>true</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection</description> + <name>findAll</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyFindAllTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The expression to filter the elements to iterate over</description> + <name>expr</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>true</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection and collects the elements + you want to work with</description> + <name>collect</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyCollectTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The expression to use to collect the elements. The + expression must retur true to add the element to the + collection</description> + <name>expr</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description>Iterates over the given collection and filters the elements + with a regular expression</description> + <name>grep</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyGrepTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The collection to iterate over</description> + <name>in</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>An optional var-name to reference onto the elements</description> + <name>var</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The regular expression to filter the element with. The + filter is a simple Groovy Regex</description> + <name>filter</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>status</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> + <description>A tag that attempts to render an input for a bean property + into an appropriate component based on the type. It uses the templates + defined in "grails-app/views/scaffolding" to achieve this by looking up + the template by type.</description> + <name>renderInput</name> + <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyRenderInputTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description>The Bean to render the input for</description> + <name>bean</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description>The property of the bean to render input for</description> + <name>property</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> + + <tag> <name>link</name> <tag-class>org.codehaus.groovy.grails.web.taglib.jsp.JspLinkTag</tag-class> <body-content>JSP</body-content> racetrack_ch8/web-app/WEB-INF/tld/grails.tld @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" racetrack_ch8/web-app/WEB-INF/web.template.xml @@ -1 +1 @@ -<web-app xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd' version='2.4' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://java.sun.com/xml/ns/j2ee'><context-param><param-name>log4jConfigLocation</param-name><param-value>/WEB-INF/classes/log4j.properties</param-value></context-param><context-param><param-name>contextConfigLocation</param-name><param-value>/WEB-INF/applicationContext.xml</param-value></context-param><context-param><param-name>webAppRootKey</param-name><param-value>racetrack</param-value></context-param><filter><filter-name>sitemesh</filter-name><filter-class>org.codehaus.groovy.grails.web.sitemesh.GrailsPageFilter</filter-class></filter><filter><filter-name>charEncodingFilter</filter-name><filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class><init-param><param-name>targetBeanName</param-name><param-value>characterEncodingFilter</param-value></init-param><init-param><param-name>targetFilterLifecycle</param-name><param-value>true</param-value></init-param></filter><filter><filter-name>grailsWebRequest</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequestFilter</filter-class></filter><filter-mapping><filter-name>charEncodingFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>grailsWebRequest</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>sitemesh</filter-name><url-pattern>/*</url-pattern></filter-mapping><listener><listener-class>org.springframework.web.util.Log4jConfigListener</listener-class></listener><listener><listener-class>org.codehaus.groovy.grails.web.context.GrailsContextLoaderListener</listener-class></listener><servlet><servlet-name>grails</servlet-name><servlet-class>org.codehaus.groovy.grails.web.servlet.GrailsDispatcherServlet</servlet-class><load-on-startup>1</load-on-startup></servlet><servlet><servlet-name>gsp</servlet-name><servlet-class>org.codehaus.groovy.grails.web.pages.GroovyPagesServlet</servlet-class></servlet><servlet-mapping><servlet-name>gsp</servlet-name><url-pattern>*.gsp</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>/base/*</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>/user/*</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>/registration/*</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>/race/*</url-pattern></servlet-mapping><welcome-file-list><welcome-file>index.jsp</welcome-file><welcome-file>index.gsp</welcome-file></welcome-file-list><jsp-config><taglib><taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri><taglib-location>/WEB-INF/tld/c.tld</taglib-location></taglib><taglib><taglib-uri>http://java.sun.com/jsp/jstl/fmt</taglib-uri><taglib-location>/WEB-INF/tld/fmt.tld</taglib-location></taglib><taglib><taglib-uri>http://www.springframework.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/spring.tld</taglib-location></taglib><taglib><taglib-uri>http://grails.codehaus.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/grails.tld</taglib-location></taglib></jsp-config></web-app> \ No newline at end of file +<web-app xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd' version='2.4' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://java.sun.com/xml/ns/j2ee'><context-param><param-name>log4jConfigLocation</param-name><param-value>/WEB-INF/classes/log4j.properties</param-value></context-param><context-param><param-name>contextConfigLocation</param-name><param-value>/WEB-INF/applicationContext.xml</param-value></context-param><context-param><param-name>webAppRootKey</param-name><param-value>racetrack</param-value></context-param><filter><filter-name>sitemesh</filter-name><filter-class>org.codehaus.groovy.grails.web.sitemesh.GrailsPageFilter</filter-class></filter><filter><filter-name>charEncodingFilter</filter-name><filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class><init-param><param-name>targetBeanName</param-name><param-value>characterEncodingFilter</param-value></init-param><init-param><param-name>targetFilterLifecycle</param-name><param-value>true</param-value></init-param></filter><filter><filter-name>grailsWebRequest</filter-name><filter-class>org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequestFilter</filter-class></filter><filter><filter-name>urlMapping</filter-name><filter-class>org.codehaus.groovy.grails.web.mapping.filter.UrlMappingsFilter</filter-class></filter><filter-mapping><filter-name>charEncodingFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>grailsWebRequest</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>sitemesh</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>urlMapping</filter-name><url-pattern>/*</url-pattern></filter-mapping><listener><listener-class>org.springframework.web.util.Log4jConfigListener</listener-class></listener><listener><listener-class>org.codehaus.groovy.grails.web.context.GrailsContextLoaderListener</listener-class></listener><servlet><servlet-name>grails</servlet-name><servlet-class>org.codehaus.groovy.grails.web.servlet.GrailsDispatcherServlet</servlet-class><load-on-startup>1</load-on-startup></servlet><servlet><servlet-name>gsp</servlet-name><servlet-class>org.codehaus.groovy.grails.web.pages.GroovyPagesServlet</servlet-class></servlet><servlet-mapping><servlet-name>gsp</servlet-name><url-pattern>*.gsp</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>*.dispatch</url-pattern></servlet-mapping><welcome-file-list><welcome-file>index.jsp</welcome-file><welcome-file>index.gsp</welcome-file></welcome-file-list><jsp-config><taglib><taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri><taglib-location>/WEB-INF/tld/c.tld</taglib-location></taglib><taglib><taglib-uri>http://java.sun.com/jsp/jstl/fmt</taglib-uri><taglib-location>/WEB-INF/tld/fmt.tld</taglib-location></taglib><taglib><taglib-uri>http://www.springframework.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/spring.tld</taglib-location></taglib><taglib><taglib-uri>http://grails.codehaus.org/tags</taglib-uri><taglib-location>/WEB-INF/tld/grails.tld</taglib-location></taglib></jsp-config></web-app> \ No newline at end of file racetrack_ch8/web-app/WEB-INF/web.xml @@ -124,4 +124,15 @@ td .errors { .prop .value { text-align:left; width:80%; +} + +.prevLink, .step, .currentStep, .nextLink { + padding-right: 5px; +} +.currentStep { + font-weight:bold; +} + +th.sorted a, th.sorted a:link, th.sorted a:visited, th.sorted a:hover, th.sortable a, th.sortable a:link, th.sortable a:visited, th.sortable a:hover { + color: white; } \ No newline at end of file racetrack_ch8/web-app/css/main.css @@ -1,7 +1,7 @@ function warnBeforeRaceDelete() { return confirm('Are you sure you want to delete this race?') -} +} function warnBeforeRegistrationDelete() { return confirm('Are you sure you want to delete this registration?') -} \ No newline at end of file +} racetrack_ch8/web-app/js/racetrack.js racetrack_ch3/plugins/core/grails-app/taglib/TagLibUtil.groovy racetrack_ch3/web-app/index.jsp racetrack_ch4/plugins/core/grails-app/taglib/TagLibUtil.groovy racetrack_ch4/web-app/index.jsp racetrack_ch5/plugins/core/grails-app/taglib/TagLibUtil.groovy racetrack_ch5/web-app/index.jsp racetrack_ch6/plugins/core/grails-app/taglib/TagLibUtil.groovy racetrack_ch6/web-app/index.jsp racetrack_ch7/plugins/core/grails-app/taglib/TagLibUtil.groovy racetrack_ch7/web-app/index.jsp racetrack_ch8/jboss/log4j.xml racetrack_ch8/plugins/core/grails-app/taglib/TagLibUtil.groovy racetrack_ch8/racetrack.war racetrack_ch8/web-app/index.jsp c6a98d59cd15bd7cef72be30154b4e698e07850a Jason Rudolph jason@thinkrelevance.com http://github.com/jasonrudolph/racetrack/commit/2c0585bd9ee003ce61e78dee8774236d0ce6f7d0 2c0585bd9ee003ce61e78dee8774236d0ce6f7d0 2008-09-01T20:39:02-07:00 2008-09-01T20:39:02-07:00 RaceTrack application built with Grails 0.5 0ca710a891ba7ed4cb2121f02d92a3effb3ffe86 Jason Rudolph jason@thinkrelevance.com