Author: fdesbois Date: 2010-05-20 19:54:37 +0200 (Thu, 20 May 2010) New Revision: 3008 Url: http://chorem.org/repositories/revision/pollen/3008 Log: - Add some notes - Change restriction for email on UserLists -> email is required. It's pretty tricky to check if user has email on poll creation (what can we do about accountUid on each participant ?) Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/PollFormModel.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollForm.java trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/UserListsUpdate.tml Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java 2010-05-20 17:36:51 UTC (rev 3007) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java 2010-05-20 17:54:37 UTC (rev 3008) @@ -182,7 +182,7 @@ } else { logo = "pollen" + pageLogo + "_en.png"; } - + // Initialize contextPath for servicePollUri servicePollUri.setContextPath(getServerPath()); } Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/PollFormModel.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/PollFormModel.java 2010-05-20 17:36:51 UTC (rev 3007) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/PollFormModel.java 2010-05-20 17:54:37 UTC (rev 3008) @@ -364,6 +364,10 @@ "error endChoiceDate before beginChoiceDate"); } } + + // TODO-fdesbois-2010-05-20 : change exceptions by ErrorReport + // validation rules : + // - not allowed to save poll without choice if addChoiceAllowed is false } /** Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollForm.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollForm.java 2010-05-20 17:36:51 UTC (rev 3007) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollForm.java 2010-05-20 17:54:37 UTC (rev 3008) @@ -679,6 +679,8 @@ addError(message); return mainZone; } + } else { + // TODO-fdesbois-2010-05-20 : display a pretty message for this case : the links page need to be keeped by user } if (getPoll().getPollType().isRestrictedOrGroup()) { pollLinks.addInfo("Les votants ont reçu un mail !"); Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/UserListsUpdate.tml =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/UserListsUpdate.tml 2010-05-20 17:36:51 UTC (rev 3007) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/UserListsUpdate.tml 2010-05-20 17:54:37 UTC (rev 3008) @@ -26,7 +26,7 @@ </p:nameCell> <p:emailCell> <t:if t:test="editionMode"> - <input t:type="textfield" t:id="editEmail" value="participantEdited.email" t:validate="regexp" size="15" /> + <input t:type="textfield" t:id="editEmail" value="participantEdited.email" t:validate="required,regexp" size="15" /> <p:else>${participant.email}</p:else> </t:if> </p:emailCell>