Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 18 → Rev 19

/kickup/trunk/webapp/WEB-INF/struts-config.xml
18,6 → 18,8
<form-property name="id" type="java.lang.String" />
<form-property name="name" type="java.lang.String" />
<form-property name="place" type="java.lang.String" />
<form-property name="email" type="java.lang.String" />
<form-property name="admins" type="java.lang.String" />
<form-property name="address" type="java.lang.String" />
<form-property name="transport" type="java.lang.String" />
<form-property name="start" type="java.lang.String" />
77,6 → 79,13
</form-bean>
 
<form-bean
name="ParticipantLoginForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="event" type="java.lang.String" />
<form-property name="ident" type="java.lang.String" />
</form-bean>
 
<form-bean
name="ParticipantEditForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="id" type="java.lang.String" />
98,6 → 107,45
<form-property name="comment" type="java.lang.String" />
<form-property name="privateComment" type="java.lang.String" />
</form-bean>
 
<form-bean
name="ParticipantRegisterForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="event" type="java.lang.String" />
<form-property name="nick" type="java.lang.String" />
<form-property name="email" type="java.lang.String" />
<form-property name="emailPublic" type="java.lang.Boolean" />
<form-property name="name" type="java.lang.String" />
<form-property name="phone" type="java.lang.String" />
<form-property name="persons" type="java.lang.String" />
<form-property name="fromZip" type="java.lang.String" />
<form-property name="fromCity" type="java.lang.String" />
<form-property name="departure" type="java.lang.String" />
<form-property name="freeTransport" type="java.lang.String" />
<form-property name="transportComment" type="java.lang.String" />
<form-property name="freeSleep" type="java.lang.String" />
<form-property name="sleepComment" type="java.lang.String" />
<form-property name="comment" type="java.lang.String" />
</form-bean>
 
<form-bean
name="ParticipantRegisterEditForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="ident" type="java.lang.String" />
<form-property name="event" type="java.lang.String" />
<form-property name="emailPublic" type="java.lang.Boolean" />
<form-property name="name" type="java.lang.String" />
<form-property name="phone" type="java.lang.String" />
<form-property name="persons" type="java.lang.String" />
<form-property name="fromZip" type="java.lang.String" />
<form-property name="fromCity" type="java.lang.String" />
<form-property name="departure" type="java.lang.String" />
<form-property name="freeTransport" type="java.lang.String" />
<form-property name="transportComment" type="java.lang.String" />
<form-property name="freeSleep" type="java.lang.String" />
<form-property name="sleepComment" type="java.lang.String" />
<form-property name="comment" type="java.lang.String" />
</form-bean>
</form-beans>
 
<global-exceptions>
153,6 → 201,74
<forward name="default" path="/participant/list.jsp" />
</action>
 
<action
path="/participant/register"
type="ak.kickup.core.action.ParticipantAction"
parameter="register"
name="ParticipantListForm"
validate="true"
scope="request"
>
<forward name="default" path="/participant/register.jsp" />
</action>
 
<action
path="/participant/submit"
type="ak.kickup.core.action.ParticipantAction"
parameter="submit"
name="ParticipantRegisterForm"
validate="true"
scope="request"
input="/participant/register.jsp"
>
</action>
 
<action
path="/participant/ident"
type="ak.kickup.core.action.ParticipantAction"
parameter="ident"
name="ParticipantListForm"
validate="true"
scope="request"
>
<forward name="default" path="/participant/ident.jsp" />
</action>
 
<action
path="/participant/login"
type="ak.kickup.core.action.ParticipantAction"
parameter="login"
name="ParticipantLoginForm"
validate="true"
scope="request"
input="/participant/ident.jsp"
>
<forward name="default" path="/participant/edit.jsp" />
</action>
 
<action
path="/participant/update"
type="ak.kickup.core.action.ParticipantAction"
parameter="update"
name="ParticipantRegisterEditForm"
validate="true"
scope="request"
input="/participant/edit.jsp"
>
</action>
 
<action
path="/participant/unregister"
type="ak.kickup.core.action.ParticipantAction"
parameter="unregister"
name="ParticipantLoginForm"
validate="true"
scope="request"
input="/participant/login.jsp"
>
<forward name="default" path="/participant/unregistered.jsp" />
</action>
 
<!-- == transport =========================================================================== -->
 
<action
/kickup/trunk/webapp/WEB-INF/validation.xml
22,6 → 22,13
<field property="name" depends="required">
<msg name="required" key="ak.kickup.core.event.edit.name.required" />
</field>
<field property="admins" depends="required">
<msg name="required" key="ak.kickup.core.event.edit.admins.required" />
</field>
<field property="email" depends="required,email">
<msg name="required" key="ak.kickup.core.event.edit.email.required" />
<msg name="email" key="ak.kickup.core.event.edit.email.wrong" />
</field>
<field property="start" depends="date">
<msg name="date" key="ak.kickup.core.event.edit.start.wrong" />
</field>
87,6 → 94,15
</field>
</form>
 
<form name="ParticipantLoginForm">
<field property="event" depends="long">
<msg name="long" key="ak.kickup.core.participant.edit.event.wrong" />
</field>
<field property="ident" depends="required">
<msg name="required" key="ak.kickup.core.participant.edit.ident.required" />
</field>
</form>
 
<form name="ParticipantEditForm">
<field property="event" depends="long">
<msg name="long" key="ak.kickup.core.participant.edit.event.wrong" />
107,9 → 123,58
<field property="freeTransport" depends="integer">
<msg name="integer" key="ak.kickup.core.participant.edit.freetransport.wrong" />
</field>
<field property="departure" depends="datetime">
<msg name="datetime" key="ak.kickup.core.participant.edit.departure.wrong" />
</field>
<field property="freeSleep" depends="integer">
<msg name="integer" key="ak.kickup.core.participant.edit.freesleep.wrong" />
</field>
</form>
 
<form name="ParticipantRegisterForm">
<field property="event" depends="long">
<msg name="long" key="ak.kickup.core.participant.edit.event.wrong" />
</field>
<field property="nick" depends="required">
<msg name="required" key="ak.kickup.core.participant.edit.nick.required" />
</field>
<field property="email" depends="required,email">
<msg name="required" key="ak.kickup.core.participant.edit.email.required" />
<msg name="email" key="ak.kickup.core.participant.edit.email.wrong" />
</field>
<field property="persons" depends="integer">
<msg name="integer" key="ak.kickup.core.participant.edit.persons.wrong" />
</field>
<field property="freeTransport" depends="integer">
<msg name="integer" key="ak.kickup.core.participant.edit.freetransport.wrong" />
</field>
<field property="departure" depends="datetime">
<msg name="datetime" key="ak.kickup.core.participant.edit.departure.wrong" />
</field>
<field property="freeSleep" depends="integer">
<msg name="integer" key="ak.kickup.core.participant.edit.freesleep.wrong" />
</field>
</form>
 
<form name="ParticipantRegisterEditForm">
<field property="ident" depends="required">
<msg name="required" key="ak.kickup.core.participant.edit.ident.required" />
</field>
<field property="event" depends="long">
<msg name="long" key="ak.kickup.core.participant.edit.event.wrong" />
</field>
<field property="persons" depends="integer">
<msg name="integer" key="ak.kickup.core.participant.edit.persons.wrong" />
</field>
<field property="freeTransport" depends="integer">
<msg name="integer" key="ak.kickup.core.participant.edit.freetransport.wrong" />
</field>
<field property="departure" depends="datetime">
<msg name="datetime" key="ak.kickup.core.participant.edit.departure.wrong" />
</field>
<field property="freeSleep" depends="integer">
<msg name="integer" key="ak.kickup.core.participant.edit.freesleep.wrong" />
</field>
</form>
</formset>
</form-validation>
/kickup/trunk/webapp/WEB-INF/validator-rules.xml
1007,6 → 1007,18
msg="errors.currency"
/>
 
<validator name="datetime"
classname="ak.kickup.util.Validator"
method="validateDateTime"
methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionErrors,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.datetime"
/>
 
</global>
 
</form-validation>